X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=86ede26272499f877b17aaa3bf949936d77be7ab;hb=6cc79b7b093af0c68c9d80c61d5aa7cfe72c9188;hp=6961f818f0e67906558db2d5a80edbd10f69c0c0;hpb=b3df411d2abd01de73870b3b456fb56c6e6446d9;p=dak.git diff --git a/madison b/madison index 6961f818..86ede262 100755 --- a/madison +++ b/madison @@ -1,8 +1,8 @@ #!/usr/bin/env python # Display information about package(s) (suite, version, etc.) -# Copyright (C) 2000, 2001, 2002 James Troup -# $Id: madison,v 1.19 2002-06-05 00:20:16 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2003 James Troup +# $Id: madison,v 1.28 2003-05-02 13:54:08 troup Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ ################################################################################ -import pg, string, sys; +import os, pg, sys; import utils, db_access; import apt_pkg; @@ -38,30 +38,19 @@ projectB = None; ################################################################################ -def arch_compare (a, b): - if a == "source" and b == "source": - return 0; - elif a == "source": - return -1; - elif b == "source": - return 1; - - return cmp (a, b); - -################################################################################ - def usage (exit_code=0): print """Usage: madison [OPTION] PACKAGE[...] Display information about PACKAGE(s). - -a, --architecture=ARCH only show info for this architecture + -a, --architecture=ARCH only show info for ARCH(s) + -c, --component=COMPONENT only show info for COMPONENT(s) + -h, --help show this help and exit -r, --regex treat PACKAGE as a regex -s, --suite=SUITE only show info for this suite -S, --source-and-binary show info for the binary children of source pkgs - -h, --help show this help and exit -Both ARCH and SUITE can be space seperated lists, e.g. - --architecture=\"m68k i386\"""" +ARCH, COMPONENT and SUITE can be comma (or space) separated lists, e.g. + --architecture=m68k,i386""" sys.exit(exit_code) ################################################################################ @@ -72,11 +61,14 @@ def main (): Cnf = utils.get_conf() Arguments = [('a', "architecture", "Madison::Options::Architecture", "HasArg"), + ('c', "component", "Madison::Options::Component", "HasArg"), + ('f', "format", "Madison::Options::Format", "HasArg"), ('r', "regex", "Madison::Options::Regex"), ('s', "suite", "Madison::Options::Suite", "HasArg"), ('S', "source-and-binary", "Madison::Options::Source-And-Binary"), ('h', "help", "Madison::Options::Help")]; - for i in ["architecture", "regex", "suite", "source-and-binary", "help" ]: + for i in [ "architecture", "component", "format", "regex", "suite", + "source-and-binary", "help" ]: if not Cnf.has_key("Madison::Options::%s" % (i)): Cnf["Madison::Options::%s" % (i)] = ""; @@ -91,51 +83,26 @@ def main (): projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); + # If cron.daily is running; warn the user that our output might seem strange + if os.path.exists(os.path.join(Cnf["Dir::Root"], "Archive_Maintenance_In_Progress")): + utils.warn("Archive maintenance is in progress; database inconsistencies are possible."); + + # Parse -a/--architecture, -s/--suite + (con_suites, con_architectures, con_components, check_source) = \ + utils.parse_args(Options); + if Options["Regex"]: comparison_operator = "~"; else: comparison_operator = "="; - if Options["Suite"]: - suite_ids_list = []; - for suite in string.split(Options["Suite"]): - suite_id = db_access.get_suite_id(suite); - if suite_id == -1: - utils.warn("suite '%s' not recognised." % (suite)); - else: - suite_ids_list.append(suite_id); - if suite_ids_list: - con_suites = "AND su.id IN (%s)" % string.join(map(str, suite_ids_list), ", "); - else: - utils.fubar("No correct suite given."); - else: - con_suites = ""; - - if Options["Architecture"]: - arch_ids_list = []; - check_source = 0; - for architecture in string.split(Options["Architecture"]): - if architecture == "source": - check_source = 1; - architecture_id = db_access.get_architecture_id(architecture); - if architecture_id == -1: - utils.warn("architecture '%s' not recognised." % (architecture)); - else: - arch_ids_list.append(architecture_id); - if arch_ids_list: - con_architectures = "AND a.id IN (%s)" % string.join(map(str, arch_ids_list), ", "); - else: - utils.fubar("No correct architecture given."); - else: - con_architectures = ""; - check_source = 1; - if Options["Source-And-Binary"]: new_packages = []; for package in packages: - q = projectB.query("SELECT DISTINCT package FROM binaries WHERE EXISTS (SELECT s.source FROM source s WHERE binaries.source = s.id AND s.source %s '%s')" % (comparison_operator, package)); + q = projectB.query("SELECT DISTINCT b.package FROM binaries b, bin_associations ba, suite su, source s WHERE b.source = s.id AND su.id = ba.suite AND b.id = ba.bin AND s.source %s '%s' %s" % (comparison_operator, package, con_suites)); new_packages.extend(map(lambda x: x[0], q.getresult())); - new_packages.append(package); + if package not in new_packages: + new_packages.append(package); packages = new_packages; results = 0; @@ -147,7 +114,7 @@ def main (): ql.extend(q.getresult()); d = {}; for i in ql: - results = results + 1; + results += 1; pkg = i[0]; version = i[1]; architecture = i[2]; @@ -169,11 +136,15 @@ def main (): suites = d[pkg][version].keys(); suites.sort(); for suite in suites: - sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite)); arches = d[pkg][version][suite]; - arches.sort(arch_compare); - sys.stdout.write(string.join(arches, ", ")); - sys.stdout.write('\n'); + arches.sort(utils.arch_compare_sw); + if Options["Format"] == "": #normal + sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite)); + sys.stdout.write(", ".join(arches)); + sys.stdout.write('\n'); + elif Options["Format"] == "heidi": + for arch in arches: + sys.stdout.write("%s %s %s\n" % (pkg, version, arch)); if not results: sys.exit(1);