X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=madison;h=a81f5a12d79a711fc457f74487efadfb9f973196;hb=17e9953dd661c4bc6da7c3c7072fb364c2f49bf4;hp=1ad72e05d5e577733dcaf13bfe2bdfca61efa8a9;hpb=98cd3d01bddf470863532e56c4aa9b58a49e820f;p=dak.git diff --git a/madison b/madison index 1ad72e05..a81f5a12 100755 --- a/madison +++ b/madison @@ -2,7 +2,7 @@ # Display information about package(s) (suite, version, etc.) # Copyright (C) 2000, 2001 James Troup -# $Id: madison,v 1.10 2001-09-13 23:57:17 troup Exp $ +# $Id: madison,v 1.15 2002-02-12 22:14:38 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; ################################################################################ @@ -48,12 +48,14 @@ def arch_compare (a, b): ################################################################################ -def usage (exit_code): +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 + -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\"""" @@ -64,77 +66,79 @@ Both ARCH and SUITE can be space seperated lists, e.g. def main (): global Cnf, projectB; - apt_pkg.init(); + Cnf = utils.get_conf() - Cnf = apt_pkg.newConfiguration(); - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); - - Arguments = [('a',"architecture","Madison::Options::Architecture", "HasArg"), - ('m',"maintainer","Madison::Options::Architecture"), - ('s',"suite","Madison::Options::Suite", "HasArg"), - ('D',"debug","Madison::Options::Debug", "IntVal"), - ('h',"help","Madison::Options::Help"), - ('V',"version","Madison::Options::Version")]; + Arguments = [('a', "architecture", "Madison::Options::Architecture", "HasArg"), + ('s', "suite", "Madison::Options::Suite", "HasArg"), + ('S', "source-and-binary", "Madison::Options::Source-And-Binary"), + ('h', "help", "Madison::Options::Help")]; + for i in ["architecture", "suite", "source-and-binary", "help" ]: + if not Cnf.has_key("Madison::Options::%s" % (i)): + Cnf["Madison::Options::%s" % (i)] = ""; packages = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); Options = Cnf.SubTree("Madison::Options") if Options["Help"]: - usage(0); - if packages == []: + usage(); + if not 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 ("; - wrong_suites = 0; - suites = string.split(Options["Suite"]); - for suite in suites: + if Options["Suite"]: + suite_ids_list = []; + for suite in string.split(Options["Suite"]): 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); - if wrong_suites >= len(suites): + suite_ids_list.append(suite_id); + if suite_ids_list: + con_suites = "AND su.id IN (%s)" % string.join(map(str, suite_ids_list), ", "); + else: utils.fubar("No correct suite given."); - con_suites = con_suites[:-3] + ")"; else: con_suites = ""; - if Options.get("Architecture"): - con_architectures = "AND ("; + if Options["Architecture"]: + arch_ids_list = []; check_source = 0; - wrong_architectures = 0; - architectures = string.split(Options["Architecture"]); - for architecture in architectures: + for architecture in string.split(Options["Architecture"]): 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); - if wrong_architectures >= len(architectures): - utils.fubar("No correct architecture given"); - con_architectures = con_architectures[:-3] + ")"; + arch_ids_list.append(architecture_id); + if arch_ids_list: + con_architectures = "AND a.id IN (%s)" % string.join(map(str, arch_ids_list), ", "); + else: + utils.fubar("No correct architecture given."); else: 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')" % (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' 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)); 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)); ql.extend(q.getresult()); d = {}; - if not ql: - sys.exit(1); for i in ql: + results = results + 1; package = i[0]; version = i[1]; architecture = i[2]; @@ -162,6 +166,9 @@ def main (): count = count + 1; sys.stdout.write('\n'); + if not results: + sys.exit(1); + ####################################################################################### if __name__ == '__main__':