From: James Troup Date: Fri, 29 Mar 2002 15:27:47 +0000 (+0000) Subject: add a -r/--regex option X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=5867d34e537a679bbd18e014f33e6c04d22505ff;p=dak.git add a -r/--regex option --- diff --git a/TODO b/TODO index 43368fa7..c08bbb39 100644 --- a/TODO +++ b/TODO @@ -9,11 +9,15 @@ Actually Urgent o lisa doesn't do the right thing with -2 and -1 uploads, as you can end up with the .orig.tar.gz not in the pool -More Urgent ------------ + o lisa can't handle non-existent .changes files + + o lisa doesn't handle :q! from rejections well at all o lisa exits if you check twice (aj) +More Urgent +----------- + o jenna sucks o queued and/or perl on sparc stable sucks @@ -189,6 +193,8 @@ Less Urgent o Add an 'add' ability to melanie (? separate prog maybe) o Replicate old dinstall report stuff (? needed ?) o Handle the case of 1:1.1 which would overwrite 1.1 (?) + o maybe drop -r/--regex in madison, make it the default and + implement -e/--exact (a la joey's "elmo") * Cleanups & misc: diff --git a/docs/madison.1.sgml b/docs/madison.1.sgml index 373c3d66..0fb3b67f 100644 --- a/docs/madison.1.sgml +++ b/docs/madison.1.sgml @@ -44,6 +44,13 @@ + + + + Treat the package argument as a regex, rather than doing an exact search. + + + Only list package information for the suite(s) listed. diff --git a/madison b/madison index a81f5a12..173c51fa 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.15 2002-02-12 22:14:38 troup Exp $ +# $Id: madison,v 1.16 2002-03-29 15:27:47 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 @@ -53,6 +53,7 @@ def usage (exit_code=0): Display information about PACKAGE(s). -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 @@ -69,10 +70,11 @@ def main (): Cnf = utils.get_conf() 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", "suite", "source-and-binary", "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)] = ""; @@ -87,6 +89,11 @@ def main (): projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); + if Options["Regex"]: + comparison_operator = "~"; + else: + comparison_operator = "="; + if Options["Suite"]: suite_ids_list = []; for suite in string.split(Options["Suite"]): @@ -124,17 +131,17 @@ 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')" % (package)); + 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: