X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=02696011f2bc1fdc5245e6fb8ba1ee9c999ad484;hb=4a37809c0bcc3a451d3d51b29e3fcc3cfe805097;hp=36c0e9a0a6affe5b12e76b4ce828b19bc46dbfd3;hpb=0ae0a3896e77f8e07a43d2a8b368466f4edabedd;p=dak.git

diff --git a/madison b/madison
index 36c0e9a0..02696011 100755
--- a/madison
+++ b/madison
@@ -2,7 +2,7 @@
 
 # 'Fix' stable to make debian-cd and dpkg -BORGiE users happy
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: madison,v 1.4 2001-03-20 00:28:11 troup Exp $
+# $Id: madison,v 1.7 2001-06-08 00:22:10 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
@@ -36,6 +36,18 @@ 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 main ():
     global Cnf, projectB;
 
@@ -44,41 +56,65 @@ def main ():
     Cnf = apt_pkg.newConfiguration();
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
 
-    Arguments = [('d',"debug","Claire::Options::Debug", "IntVal"),
-                 ('h',"help","Claire::Options::Help"),
-                 ('v',"version","Claire::Options::Version")];
+    Arguments = [('s',"suite","Madison::Options::Suite", "HasArg"),
+                 ('D',"debug","Madison::Options::Debug", "IntVal"),
+                 ('h',"help","Madison::Options::Help"),
+                 ('V',"version","Madison::Options::Version")];
 
     packages = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
-
+    Options = Cnf.SubTree("Madison::Options")
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, Cnf["DB::ROUser"]);
-
     db_access.init(Cnf, projectB);
 
+    if packages == []:
+        utils.fubar("need at least one package name as an argument.");
+
+    if Options["Suite"]:
+        con_suites = "AND (";
+        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:
+                con_suites = con_suites + "su.id = %s OR " % (suite_id)
+        con_suites = con_suites[:-3] + ")"
+    else:
+        con_suites = "";
+
+
     for package in packages:
-	q = projectB.query("SELECT b.package, b.version, a.arch_string, su.suite_name FROM binaries b, architecture a, suite su, bin_associations ba WHERE b.package = '%s' AND a.id = b.architecture AND su.id = ba.suite AND b.id = ba.bin" % (package));
+	q = projectB.query("SELECT b.package, b.version, a.arch_string, su.suite_name FROM binaries b, architecture a, suite su, bin_associations ba WHERE b.package = '%s' AND a.id = b.architecture AND su.id = ba.suite AND b.id = ba.bin %s" % (package, con_suites));
+        ql = q.getresult();
+	q = projectB.query("SELECT s.source, s.version, 'source', su.suite_name FROM source s, suite su, src_associations sa WHERE s.source = '%s' AND su.id = sa.suite AND s.id = sa.source %s" % (package, con_suites));
+        ql.extend(q.getresult());
         d = {};
-        for i in q.getresult():
+        for i in ql:
             package = i[0];
             version = i[1];
             architecture = i[2];
             suite = i[3];
-            key = (version, suite);
-            if not d.has_key(key):
-                d[key] = [];
-            d[key].append(architecture);
+            if not d.has_key(version):
+                d[version] = {};
+            if not d[version].has_key(suite):
+                d[version][suite] = [];
+            d[version][suite].append(architecture);
             
-        keys = d.keys();
-        keys.sort();
-        for i in keys:
-            (version, suite) = i;
-            sys.stdout.write("%10s | %10s | %13s | " % (package, version, suite));
-            count = 0;
-            for arch in d[i]:
-                if count > 0:
-                    sys.stdout.write(', ');
-                sys.stdout.write(arch);
-                count = count + 1;
-            sys.stdout.write('\n');
+        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');
 
 #######################################################################################