X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=5a17892b5c6480b0f76779ed36669721e2a875b4;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=58c7463356a6cdcaa3fb16abd5257912f0dea9fd;hpb=0a5f0ba0438ed59261f8bc75190846e0851a26a9;p=dak.git diff --git a/madison b/madison index 58c74633..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, 2002, 2003, 2004 James Troup -# $Id: madison,v 1.29 2004-01-21 03:20:13 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 @@ -20,10 +20,10 @@ ################################################################################ -# 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! ################################################################################ @@ -43,8 +43,10 @@ def usage (exit_code=0): Display information about PACKAGE(s). -a, --architecture=ARCH only show info for ARCH(s) - -b, --binary-type=TYPE only show info for binary TYPE(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 @@ -65,12 +67,15 @@ def main (): ('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", "binarytype", "component", "format", "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,6 +94,13 @@ def main (): 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); @@ -119,22 +131,39 @@ def main (): 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 %s" % (comparison_operator, package, con_suites, con_architectures, con_bintype)); + 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 += 1; - pkg = i[0]; - version = i[1]; - architecture = i[2]; - suite = i[3]; + (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); @@ -157,6 +186,10 @@ def main (): 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);