X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=3799746377cf3d023d5c5dede054c6e7733ee66c;hb=c6829c52160d0e1ee1ccf15a32c6a9d0078e2708;hp=1ce965d13be125cc57fefcabe4a6a0b1d45d110b;hpb=b77044c2e1855ffb8eb1a696c12e5d2b40d014e4;p=dak.git diff --git a/madison b/madison index 1ce965d1..37997463 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 -# $Id: madison,v 1.23 2003-01-02 18:11:20 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2003 James Troup +# $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 @@ -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;