Fix duplicate output with -S/--source-and-binary

[dak.git] / madison

diff --git a/madison b/madison
index 445e29682b9fe69bc24ba6872d17e3efb8c7af58..3799746377cf3d023d5c5dede054c6e7733ee66c 100755 (executable)
--- 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.25 2003-02-10 18:24:24 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
@@ -43,10 +43,10 @@ def usage (exit_code=0):
 Display information about PACKAGE(s).
 
   -a, --architecture=ARCH    only show info for this architecture
+  -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\""""
@@ -93,9 +93,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 package FROM binaries JOIN source ON binaries.source = source.id WHERE source.source %s '%s'" % (comparison_operator, package));
             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;