X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=86ede26272499f877b17aaa3bf949936d77be7ab;hb=6cc79b7b093af0c68c9d80c61d5aa7cfe72c9188;hp=445e29682b9fe69bc24ba6872d17e3efb8c7af58;hpb=57c788ad1fdcb514731a973e3aa5cdfbf7a6c19e;p=dak.git

diff --git a/madison b/madison
index 445e2968..86ede262 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, 2002  James Troup <james@nocrew.org>
-# $Id: madison,v 1.22 2002-12-08 17:25:17 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
+# $Id: madison,v 1.28 2003-05-02 13:54:08 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
@@ -27,7 +27,7 @@
 
 ################################################################################
 
-import pg, sys;
+import os, pg, sys;
 import utils, db_access;
 import apt_pkg;
 
@@ -42,14 +42,15 @@ def usage (exit_code=0):
     print """Usage: madison [OPTION] PACKAGE[...]
 Display information about PACKAGE(s).
 
-  -a, --architecture=ARCH    only show info for this architecture
+  -a, --architecture=ARCH    only show info for ARCH(s)
+  -c, --component=COMPONENT  only show info for COMPONENT(s)
+  -h, --help                 show this help and exit
   -r, --regex                treat PACKAGE as a regex
   -s, --suite=SUITE          only show info for this suite
   -S, --source-and-binary    show info for the binary children of source pkgs
-  -h, --help                 show this help and exit
 
-Both ARCH and SUITE can be space seperated lists, e.g.
-    --architecture=\"m68k i386\""""
+ARCH, COMPONENT and SUITE can be comma (or space) separated lists, e.g.
+    --architecture=m68k,i386"""
     sys.exit(exit_code)
 
 ################################################################################
@@ -61,11 +62,12 @@ def main ():
 
     Arguments = [('a', "architecture", "Madison::Options::Architecture", "HasArg"),
                  ('c', "component", "Madison::Options::Component", "HasArg"),
+                 ('f', "format", "Madison::Options::Format", "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", "component", "regex", "suite",
+    for i in [ "architecture", "component", "format", "regex", "suite",
                "source-and-binary", "help" ]:
 	if not Cnf.has_key("Madison::Options::%s" % (i)):
 	    Cnf["Madison::Options::%s" % (i)] = "";
@@ -81,6 +83,10 @@ def main ():
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
+    # If cron.daily is running; warn the user that our output might seem strange
+    if os.path.exists(os.path.join(Cnf["Dir::Root"], "Archive_Maintenance_In_Progress")):
+        utils.warn("Archive maintenance is in progress; database inconsistencies are possible.");
+
     # Parse -a/--architecture, -s/--suite
     (con_suites, con_architectures, con_components, check_source) = \
                  utils.parse_args(Options);
@@ -93,9 +99,10 @@ def main ():
     if Options["Source-And-Binary"]:
         new_packages = [];
         for package in packages:
-            q = projectB.query("SELECT DISTINCT package FROM binaries WHERE EXISTS (SELECT s.source FROM source s WHERE binaries.source = s.id AND s.source %s '%s')" % (comparison_operator, package));
+            q = projectB.query("SELECT DISTINCT b.package FROM binaries b, bin_associations ba, suite su, source s WHERE b.source = s.id AND su.id = ba.suite AND b.id = ba.bin AND s.source %s '%s' %s" % (comparison_operator, package, con_suites));
             new_packages.extend(map(lambda x: x[0], q.getresult()));
-            new_packages.append(package);
+            if package not in new_packages:
+                new_packages.append(package);
         packages = new_packages;
 
     results = 0;
@@ -129,11 +136,15 @@ def main ():
                 suites = d[pkg][version].keys();
                 suites.sort();
                 for suite in suites:
-                    sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite));
                     arches = d[pkg][version][suite];
                     arches.sort(utils.arch_compare_sw);
-                    sys.stdout.write(", ".join(arches));
-                    sys.stdout.write('\n');
+                    if Options["Format"] == "": #normal
+                        sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite));
+                        sys.stdout.write(", ".join(arches));
+                        sys.stdout.write('\n');
+                    elif Options["Format"] == "heidi":
+                        for arch in arches:
+                            sys.stdout.write("%s %s %s\n" % (pkg, version, arch));
 
     if not results:
         sys.exit(1);