X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=34532c8ddeb1963d7f6c1f93be3e4d40de1b30a9;hb=94e2fcb4d54908b37bf48ba43ea4adde7a047b50;hp=f32157b3892bf813a2db76b8855ce1ebdd3da414;hpb=50c3a3dfa86c10a3b7eae0f887912605275b518e;p=dak.git

diff --git a/madison b/madison
index f32157b3..34532c8d 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  James Troup <james@nocrew.org>
-# $Id: madison,v 1.17 2002-03-29 15:58:02 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: madison,v 1.21 2002-10-16 02:47:32 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
@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+################################################################################
+
 #   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*''
@@ -25,7 +27,7 @@
 
 ################################################################################
 
-import pg, string, sys;
+import pg, sys;
 import utils, db_access;
 import apt_pkg;
 
@@ -70,11 +72,13 @@ def main ():
     Cnf = utils.get_conf()
 
     Arguments = [('a', "architecture", "Madison::Options::Architecture", "HasArg"),
+                 ('c', "component", "Madison::Options::Component", "HasArg"),
                  ('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", "regex", "suite", "source-and-binary", "help" ]:
+    for i in [ "architecture", "component", "regex", "suite",
+               "source-and-binary", "help" ]:
 	if not Cnf.has_key("Madison::Options::%s" % (i)):
 	    Cnf["Madison::Options::%s" % (i)] = "";
 
@@ -89,45 +93,15 @@ def main ():
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
+    # Parse -a/--architecture, -s/--suite
+    (con_suites, con_architectures, con_components, check_source) = \
+                 utils.parse_args(Options);
+
     if Options["Regex"]:
         comparison_operator = "~";
     else:
         comparison_operator = "=";
 
-    if Options["Suite"]:
-        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));
-            else:
-                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.");
-    else:
-        con_suites = "";
-
-    if Options["Architecture"]:
-        arch_ids_list = [];
-        check_source = 0;
-        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));
-            else:
-                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;
-
     if Options["Source-And-Binary"]:
         new_packages = [];
         for package in packages:
@@ -145,7 +119,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];
@@ -168,14 +142,9 @@ def main ():
                 suites.sort();
                 for suite in suites:
                     sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite));
-                    count = 0;
                     arches = d[pkg][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(", ".join(arches));
                     sys.stdout.write('\n');
 
     if not results: