better error handling for -s/-a; return 1 if no package found; add help. [tbm]

diff --git a/madison b/madison
index 4c176008f5e481d8febf68d8d1b7597dc6cb53c6..1ad72e05d5e577733dcaf13bfe2bdfca61efa8a9 100755 (executable)
--- 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.9 2001-09-05 18:51:21 rmurray Exp $
+# $Id: madison,v 1.10 2001-09-13 23:57:17 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
@@ -48,6 +48,19 @@ def arch_compare (a, b):
 
 ################################################################################
 
+def usage (exit_code):
+    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
+
+Both ARCH and SUITE can be space seperated lists, e.g.
+    --architecture=\"m68k i386\""""
+    sys.exit(exit_code)
+
+################################################################################
+
 def main ():
     global Cnf, projectB;
 
@@ -65,36 +78,49 @@ def main ():
 
     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"]));
-    db_access.init(Cnf, projectB);
 
+    if Options["Help"]:
+        usage(0);
     if 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 (";
-        for suite in string.split(Options["Suite"]):
+        wrong_suites = 0;
+        suites = string.split(Options["Suite"]);
+        for suite in suites:
             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)
-        con_suites = con_suites[:-3] + ")"
+                con_suites = con_suites + "su.id = %s OR " % (suite_id);
+        if wrong_suites >= len(suites):
+            utils.fubar("No correct suite given.");
+        con_suites = con_suites[:-3] + ")";
     else:
         con_suites = "";
 
     if Options.get("Architecture"):
         con_architectures = "AND (";
         check_source = 0;
-        for architecture in string.split(Options["Architecture"]):
+        wrong_architectures = 0;
+        architectures = string.split(Options["Architecture"]);
+        for architecture in architectures:
             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)
-        con_architectures = con_architectures[:-3] + ")"
+                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] + ")";
     else:
         con_architectures = "";
         check_source = 1;
@@ -106,6 +132,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:
             package = i[0];
             version = i[1];