tbm list handling clean up, plus usual == [], r removal etc.

[dak.git] / madison

diff --git a/madison b/madison
index 7496dd6873396121d43fa5f5e52167c3458571e4..47e33f6aeb17f7985df6eded70d5795490585923 100755 (executable)
--- a/madison
+++ b/madison
@@ -2,7 +2,7 @@
 
 # Display information about package(s) (suite, version, etc.)
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: madison,v 1.11 2001-09-27 01:23:41 troup Exp $
+# $Id: madison,v 1.12 2001-11-04 22:35:11 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
@@ -81,50 +81,47 @@ def main ():
 
     if Options["Help"]:
         usage();
-    if packages == []:
+    if not packages:
         utils.fubar("need at least one package name as an argument.");
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
     if Options.get("Suite"):
-        con_suites = "AND (";
-        wrong_suites = 0;
-        suites = string.split(Options["Suite"]);
-        for suite in suites:
+        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));
-                wrong_suites = wrong_suites + 1;
             else:
-                con_suites = con_suites + "su.id = %s OR " % (suite_id);
-        if wrong_suites >= len(suites):
+                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.");
-        con_suites = con_suites[:-3] + ")";
     else:
         con_suites = "";
 
     if Options.get("Architecture"):
-        con_architectures = "AND (";
+        arch_ids_list = [];
         check_source = 0;
-        wrong_architectures = 0;
-        architectures = string.split(Options["Architecture"]);
-        for architecture in architectures:
+        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));
-                wrong_architectures = wrong_architectures + 1;
             else:
-                con_architectures = con_architectures + "a.id = %s OR " % (architecture_id);
-        if wrong_architectures >= len(architectures):
-            utils.fubar("No correct architecture given");
-        con_architectures = con_architectures[:-3] + ")";
+                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;
 
+    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' AND a.id = b.architecture AND su.id = ba.suite AND b.id = ba.bin AND b.maintainer = m.id %s %s" % (package, con_suites, con_architectures));
         ql = q.getresult();
@@ -132,9 +129,8 @@ def main ():
             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' AND su.id = sa.suite AND s.id = sa.source AND s.maintainer = m.id %s" % (package, con_suites));
             ql.extend(q.getresult());
         d = {};
-        if not ql:
-            sys.exit(1);
         for i in ql:
+            results = results + 1;
             package = i[0];
             version = i[1];
             architecture = i[2];
@@ -162,6 +158,9 @@ def main ():
                     count = count + 1;
                 sys.stdout.write('\n');
 
+    if not results:
+        sys.exit(1);
+
 #######################################################################################
 
 if __name__ == '__main__':