X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=86ede26272499f877b17aaa3bf949936d77be7ab;hb=a29673e49824a6c0838df50ab64ac08cf32852d8;hp=47e33f6aeb17f7985df6eded70d5795490585923;hpb=128d4606233f6e4147f6b74b108bf03b4dd76c07;p=dak.git diff --git a/madison b/madison index 47e33f6a..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 James Troup -# $Id: madison,v 1.12 2001-11-04 22:35:11 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 @@ -18,6 +18,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################ + # And, lo, a great and menacing voice rose from the depths, and with # great wrath and vehemence it's voice boomed across the # land... ``hehehehehehe... that *tickles*'' @@ -25,8 +27,8 @@ ################################################################################ -import pg, sys, os, string -import utils, db_access +import os, pg, sys; +import utils, db_access; import apt_pkg; ################################################################################ @@ -36,28 +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 information for this architecture - -s, --suite=SUITE only show information for this suite + -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 -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) ################################################################################ @@ -65,16 +58,19 @@ Both ARCH and SUITE can be space seperated lists, e.g. def main (): global Cnf, projectB; - apt_pkg.init(); + Cnf = utils.get_conf() - Cnf = apt_pkg.newConfiguration(); - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); - - Arguments = [('a',"architecture","Madison::Options::Architecture", "HasArg"), - ('s',"suite","Madison::Options::Suite", "HasArg"), - ('h',"help","Madison::Options::Help")]; - for i in ["architecture", "suite", "help" ]: - Cnf["Madison::Options::%s" % (i)] = ""; + 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", "component", "format", "regex", "suite", + "source-and-binary", "help" ]: + if not Cnf.has_key("Madison::Options::%s" % (i)): + Cnf["Madison::Options::%s" % (i)] = ""; packages = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); Options = Cnf.SubTree("Madison::Options") @@ -87,76 +83,68 @@ def main (): projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); - if Options.get("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.get("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."); + # 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: - con_architectures = ""; - check_source = 1; + comparison_operator = "="; + + if Options["Source-And-Binary"]: + new_packages = []; + for package in packages: + 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())); + if package not in new_packages: + new_packages.append(package); + packages = new_packages; results = 0; for package in packages: - q = projectB.query("SELECT b.package, b.version, a.arch_string, su.suite_name, m.name FROM binaries b, architecture a, suite su, bin_associations ba, maintainer m WHERE b.package = '%s' AND a.id = b.architecture AND su.id = ba.suite AND b.id = ba.bin AND b.maintainer = m.id %s %s" % (package, con_suites, con_architectures)); + q = projectB.query("SELECT b.package, b.version, a.arch_string, su.suite_name, m.name FROM binaries b, architecture a, suite su, bin_associations ba, maintainer m WHERE b.package %s '%s' AND a.id = b.architecture AND su.id = ba.suite AND b.id = ba.bin AND b.maintainer = m.id %s %s" % (comparison_operator, package, con_suites, con_architectures)); ql = q.getresult(); if check_source: - q = projectB.query("SELECT s.source, s.version, 'source', su.suite_name, m.name FROM source s, suite su, src_associations sa, maintainer m WHERE s.source = '%s' AND su.id = sa.suite AND s.id = sa.source AND s.maintainer = m.id %s" % (package, con_suites)); + q = projectB.query("SELECT s.source, s.version, 'source', su.suite_name, m.name FROM source s, suite su, src_associations sa, maintainer m WHERE s.source %s '%s' AND su.id = sa.suite AND s.id = sa.source AND s.maintainer = m.id %s" % (comparison_operator, package, con_suites)); ql.extend(q.getresult()); d = {}; for i in ql: - results = results + 1; - package = i[0]; + results += 1; + pkg = i[0]; version = i[1]; architecture = i[2]; suite = i[3]; - if not d.has_key(version): - d[version] = {}; - if not d[version].has_key(suite): - d[version][suite] = []; - d[version][suite].append(architecture); - - versions = d.keys(); - versions.sort(apt_pkg.VersionCompare); - for version in versions: - suites = d[version].keys(); - suites.sort(); - for suite in suites: - sys.stdout.write("%10s | %10s | %13s | " % (package, version, suite)); - count = 0; - arches = d[version][suite]; - arches.sort(arch_compare); - for arch in arches: - if count > 0: - sys.stdout.write(', '); - sys.stdout.write(arch); - count = count + 1; - sys.stdout.write('\n'); + if not d.has_key(pkg): + d[pkg] = {}; + if not d[pkg].has_key(version): + d[pkg][version] = {}; + if not d[pkg][version].has_key(suite): + d[pkg][version][suite] = []; + d[pkg][version][suite].append(architecture); + + packages = d.keys(); + packages.sort(); + for pkg in packages: + versions = d[pkg].keys(); + versions.sort(apt_pkg.VersionCompare); + for version in versions: + suites = d[pkg][version].keys(); + suites.sort(); + for suite in suites: + arches = d[pkg][version][suite]; + 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);