X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=5a17892b5c6480b0f76779ed36669721e2a875b4;hb=eef6d96ac51629f716291e81f07e54afe915ee8e;hp=173c51fa21a20959c620cd02318ef234dfab3552;hpb=5867d34e537a679bbd18e014f33e6c04d22505ff;p=dak.git diff --git a/madison b/madison index 173c51fa..5a17892b 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.16 2002-03-29 15:27:47 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 James Troup +# $Id: madison,v 1.33 2005-11-15 09:50:32 ajt 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,14 +18,16 @@ # 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*'' -# -- aj on IRC +################################################################################ + +# ooo, elmo has "special powers" +# ooo, does he have lasers that shoot out of his eyes? +# dunno +# maybe he can turn invisible? that'd sure help with improved transparency! ################################################################################ -import pg, string, sys; +import os, pg, sys; import utils, db_access; import apt_pkg; @@ -36,30 +38,22 @@ 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) + -b, --binary-type=TYPE only show info for binary TYPE + -c, --component=COMPONENT only show info for COMPONENT(s) + -g, --greaterorequal show buildd 'dep-wait pkg >= {highest version}' info + -G, --greaterthan show buildd 'dep-wait pkg >> {highest version}' info + -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) ################################################################################ @@ -70,11 +64,18 @@ def main (): Cnf = utils.get_conf() Arguments = [('a', "architecture", "Madison::Options::Architecture", "HasArg"), + ('b', "binarytype", "Madison::Options::BinaryType", "HasArg"), + ('c', "component", "Madison::Options::Component", "HasArg"), + ('f', "format", "Madison::Options::Format", "HasArg"), + ('g', "greaterorequal", "Madison::Options::GreaterOrEqual"), + ('G', "greaterthan", "Madison::Options::GreaterThan"), ('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", "binarytype", "component", "format", + "greaterorequal", "greaterthan", "regex", "suite", + "source-and-binary", "help" ]: if not Cnf.has_key("Madison::Options::%s" % (i)): Cnf["Madison::Options::%s" % (i)] = ""; @@ -89,89 +90,106 @@ 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."); + + # Handle buildd maintenance helper options + if Options["GreaterOrEqual"] or Options["GreaterThan"]: + if Options["GreaterOrEqual"] and Options["GreaterThan"]: + utils.fubar("-g/--greaterorequal and -G/--greaterthan are mutually exclusive."); + if not Options["Suite"]: + Options["Suite"] = "unstable"; + + # Parse -a/--architecture, -c/--component and -s/--suite + (con_suites, con_architectures, con_components, check_source) = \ + utils.parse_args(Options); + + if Options["BinaryType"]: + if Options["BinaryType"] != "udeb" and Options["BinaryType"] != "deb": + utils.fubar("Invalid binary type. 'udeb' and 'deb' recognised."); + con_bintype = "AND b.type = '%s'" % (Options["BinaryType"]); + # REMOVE ME TRAMP + if Options["BinaryType"] == "udeb": + check_source = 0; + else: + con_bintype = ""; + 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; 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 '%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)); + q = projectB.query(""" +SELECT b.package, b.version, a.arch_string, su.suite_name, c.name, m.name + FROM binaries b, architecture a, suite su, bin_associations ba, + files f, location l, component c, maintainer m + WHERE b.package %s '%s' AND a.id = b.architecture AND su.id = ba.suite + AND b.id = ba.bin AND b.file = f.id AND f.location = l.id + AND l.component = c.id AND b.maintainer = m.id %s %s %s +""" % (comparison_operator, package, con_suites, con_architectures, con_bintype)); 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 '%s' AND su.id = sa.suite AND s.id = sa.source AND s.maintainer = m.id %s" % (comparison_operator, package, con_suites)); + q = projectB.query(""" +SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name + FROM source s, suite su, src_associations sa, files f, location l, + component c, maintainer m + WHERE s.source %s '%s' AND su.id = sa.suite AND s.id = sa.source + AND s.file = f.id AND f.location = l.id AND l.component = c.id + AND s.maintainer = m.id %s +""" % (comparison_operator, package, con_suites)); ql.extend(q.getresult()); d = {}; + highver = {}; for i in ql: - results = results + 1; - package = 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'); + results += 1; + (pkg, version, architecture, suite, component, maintainer) = i; + if component != "main": + suite = "%s/%s" % (suite, component); + if not d.has_key(pkg): + d[pkg] = {}; + highver.setdefault(pkg,""); + if not d[pkg].has_key(version): + d[pkg][version] = {}; + if apt_pkg.VersionCompare(version, highver[pkg]) > 0: + highver[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 Options["GreaterOrEqual"]: + print "\n%s (>= %s)" % (pkg, highver[pkg]) + if Options["GreaterThan"]: + print "\n%s (>> %s)" % (pkg, highver[pkg]) if not results: sys.exit(1);