X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=145bb8c7ec3872894764734af9aa6bac11a4a44d;hb=38806c25d1afeb9f48dbd5550c3e8a60120e2bcc;hp=86ede26272499f877b17aaa3bf949936d77be7ab;hpb=f63929b61c6976a67b4397cdfd8f1acf642d365d;p=dak.git

diff --git a/madison b/madison
index 86ede262..145bb8c7 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  James Troup <james@nocrew.org>
-# $Id: madison,v 1.28 2003-05-02 13:54:08 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
+# $Id: madison,v 1.30 2004-04-19 15:59:12 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
@@ -43,7 +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
   -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
@@ -61,13 +64,17 @@ 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", "component", "format", "regex", "suite",
+    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)] = "";
@@ -87,10 +94,27 @@ 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.");
 
-    # Parse -a/--architecture, -s/--suite
+    # 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:
@@ -107,12 +131,13 @@ 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" % (comparison_operator, 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 %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));
             ql.extend(q.getresult());
         d = {};
+        highver = {};
         for i in ql:
             results += 1;
             pkg = i[0];
@@ -121,8 +146,11 @@ def main ():
             suite = i[3];
             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);
@@ -145,6 +173,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 "\ndep-retry %s (>= %s)" % (pkg, highver[pkg])
+            if Options["GreaterThan"]:
+                print "\ndep-retry %s (>> %s)" % (pkg, highver[pkg])
 
     if not results:
         sys.exit(1);