X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=a04615130fd2ef442eac853635d7e80285c316e5;hb=4914b5dde7ccfe58b5f88b9852deb0a19b804039;hp=cfbad280fe5913a8767293d14b51dfa5287d216d;hpb=699bafc632cb4f45f43f3cc5e22619d1e876144d;p=dak.git

diff --git a/madison b/madison
index cfbad280..a0461513 100755
--- a/madison
+++ b/madison
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-# 'Fix' stable to make debian-cd and dpkg -BORGiE users happy
+# Display information about package(s) (suite, version, etc.)
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: madison,v 1.8 2001-08-21 15:44:27 troup Exp $
+# $Id: madison,v 1.13 2001-11-18 19:57:58 rmurray 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
@@ -48,43 +48,60 @@ def arch_compare (a, b):
 
 ################################################################################
 
+def usage (exit_code=0):
+    print """Usage: madison [OPTION] PACKAGE[...]
+Display information about PACKAGE(s).
+
+  -a, --architecture=ARCH    only show information for this architecture
+  -s, --suite=SUITE          only show information for this suite
+  -h, --help                 show this help and exit
+
+Both ARCH and SUITE can be space seperated lists, e.g.
+    --architecture=\"m68k i386\""""
+    sys.exit(exit_code)
+
+################################################################################
+
 def main ():
     global Cnf, projectB;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
     Arguments = [('a',"architecture","Madison::Options::Architecture", "HasArg"),
-                 ('m',"maintainer","Madison::Options::Architecture"),
                  ('s',"suite","Madison::Options::Suite", "HasArg"),
-                 ('D',"debug","Madison::Options::Debug", "IntVal"),
-                 ('h',"help","Madison::Options::Help"),
-                 ('V',"version","Madison::Options::Version")];
+                 ('h',"help","Madison::Options::Help")];
+    for i in ["architecture", "suite", "help" ]:
+	if not Cnf.has_key("Madison::Options::%s" % (i)):
+	    Cnf["Madison::Options::%s" % (i)] = "";
 
     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 == []:
+    if Options["Help"]:
+        usage();
+    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 (";
+        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:
-                con_suites = con_suites + "su.id = %s OR " % (suite_id)
-        con_suites = con_suites[:-3] + ")"
+                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.get("Architecture"):
-        con_architectures = "AND (";
+        arch_ids_list = [];
         check_source = 0;
         for architecture in string.split(Options["Architecture"]):
             if architecture == "source":
@@ -93,12 +110,16 @@ def main ():
             if architecture_id == -1:
                 utils.warn("architecture '%s' not recognised." % (architecture));
             else:
-                con_architectures = con_architectures + "a.id = %s OR " % (architecture_id)
-        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();
@@ -107,6 +128,7 @@ def main ():
             ql.extend(q.getresult());
         d = {};
         for i in ql:
+            results = results + 1;
             package = i[0];
             version = i[1];
             architecture = i[2];
@@ -134,6 +156,9 @@ def main ():
                     count = count + 1;
                 sys.stdout.write('\n');
 
+    if not results:
+        sys.exit(1);
+
 #######################################################################################
 
 if __name__ == '__main__':