X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=9af18d9f0ac5c35261ca05fc830ad03f1fe1db34;hb=30b41506a6105ab23a0cac9e8197475a89236224;hp=a04615130fd2ef442eac853635d7e80285c316e5;hpb=2f5e692bfbbb6f8146f50d944f7fcc169a95a0a3;p=dak.git diff --git a/madison b/madison index a0461513..9af18d9f 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 James Troup -# $Id: madison,v 1.13 2001-11-18 19:57:58 rmurray Exp $ +# Copyright (C) 2000, 2001, 2002 James Troup +# $Id: madison,v 1.18 2002-05-03 16:06:45 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 @@ -25,8 +25,8 @@ ################################################################################ -import pg, sys, os, string -import utils, db_access +import pg, string, sys; +import utils, db_access; import apt_pkg; ################################################################################ @@ -52,8 +52,10 @@ 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 + -a, --architecture=ARCH only show info for this architecture + -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. @@ -67,10 +69,12 @@ def main (): Cnf = utils.get_conf() - Arguments = [('a',"architecture","Madison::Options::Architecture", "HasArg"), - ('s',"suite","Madison::Options::Suite", "HasArg"), - ('h',"help","Madison::Options::Help")]; - for i in ["architecture", "suite", "help" ]: + Arguments = [('a', "architecture", "Madison::Options::Architecture", "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", "regex", "suite", "source-and-binary", "help" ]: if not Cnf.has_key("Madison::Options::%s" % (i)): Cnf["Madison::Options::%s" % (i)] = ""; @@ -85,7 +89,12 @@ def main (): projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); - if Options.get("Suite"): + if Options["Regex"]: + comparison_operator = "~"; + else: + comparison_operator = "="; + + if Options["Suite"]: suite_ids_list = []; for suite in string.split(Options["Suite"]): suite_id = db_access.get_suite_id(suite); @@ -100,7 +109,7 @@ def main (): else: con_suites = ""; - if Options.get("Architecture"): + if Options["Architecture"]: arch_ids_list = []; check_source = 0; for architecture in string.split(Options["Architecture"]): @@ -119,42 +128,55 @@ def main (): con_architectures = ""; check_source = 1; + 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)); + new_packages.extend(map(lambda x: x[0], q.getresult())); + new_packages.append(package); + packages = new_packages; + 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)); + 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 '%s' AND a.id = b.architecture AND su.id = ba.suite AND b.id = ba.bin AND b.maintainer = m.id %s %s" % (comparison_operator, package, con_suites, con_architectures)); ql = q.getresult(); if check_source: - 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)); + 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 '%s' AND su.id = sa.suite AND s.id = sa.source AND s.maintainer = m.id %s" % (comparison_operator, package, con_suites)); ql.extend(q.getresult()); d = {}; for i in ql: results = results + 1; - package = i[0]; + pkg = i[0]; version = i[1]; architecture = i[2]; suite = i[3]; - if not d.has_key(version): - d[version] = {}; - if not d[version].has_key(suite): - d[version][suite] = []; - d[version][suite].append(architecture); - - versions = d.keys(); - versions.sort(apt_pkg.VersionCompare); - for version in versions: - suites = d[version].keys(); - suites.sort(); - for suite in suites: - sys.stdout.write("%10s | %10s | %13s | " % (package, version, suite)); - count = 0; - arches = d[version][suite]; - arches.sort(arch_compare); - for arch in arches: - if count > 0: - sys.stdout.write(', '); - sys.stdout.write(arch); - count = count + 1; - sys.stdout.write('\n'); + if not d.has_key(pkg): + d[pkg] = {}; + if not d[pkg].has_key(version): + d[pkg][version] = {}; + if not d[pkg][version].has_key(suite): + d[pkg][version][suite] = []; + d[pkg][version][suite].append(architecture); + + packages = d.keys(); + packages.sort(); + for pkg in packages: + versions = d[pkg].keys(); + versions.sort(apt_pkg.VersionCompare); + for version in versions: + suites = d[pkg][version].keys(); + suites.sort(); + for suite in suites: + sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite)); + count = 0; + arches = d[pkg][version][suite]; + arches.sort(arch_compare); + for arch in arches: + if count > 0: + sys.stdout.write(', '); + sys.stdout.write(arch); + count = count + 1; + sys.stdout.write('\n'); if not results: sys.exit(1);