X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=3799746377cf3d023d5c5dede054c6e7733ee66c;hb=96814560a5a4df0954f9e112cfc33bce760f0d88;hp=39a389dc847bfd92e0e0cc23d583c9f7ae5200b7;hpb=f4a1c7be4eed509abd330f5b850a88bb699cabfc;p=dak.git

diff --git a/madison b/madison
index 39a389dc..37997463 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 <james@nocrew.org>
-# $Id: madison,v 1.20 2002-07-14 15:02:07 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
+# $Id: madison,v 1.25 2003-02-10 18:24:24 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 pg, sys;
 import utils, db_access;
 import apt_pkg;
 
@@ -38,27 +38,15 @@ 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
+  -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\""""
@@ -105,9 +93,10 @@ def main ():
     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 package FROM binaries JOIN source ON binaries.source = source.id WHERE source.source %s '%s'" % (comparison_operator, package));
             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;
@@ -119,7 +108,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];
@@ -143,8 +132,8 @@ def main ():
                 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, ", "));
+                    arches.sort(utils.arch_compare_sw);
+                    sys.stdout.write(", ".join(arches));
                     sys.stdout.write('\n');
 
     if not results: