X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fls.py;h=5ac4c660ee508d379bddf3db5bab72db31e3e7eb;hb=98d086ddda3772fb58c1bfa97478e8044596b569;hp=a1f8c8ec2dc1b52f15cb7b0d6f46011484446218;hpb=e9628d0da14a4a046b04ac6c20675432168dcc4a;p=dak.git diff --git a/dak/ls.py b/dak/ls.py index a1f8c8ec..5ac4c660 100755 --- a/dak/ls.py +++ b/dak/ls.py @@ -1,8 +1,13 @@ #!/usr/bin/env python -# Display information about package(s) (suite, version, etc.) -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 James Troup +""" +Display information about package(s) (suite, version, etc.) +@contact: Debian FTP Master +@copyright: 2000, 2001, 2002, 2003, 2004, 2005, 2006 James Troup +@license: GNU General Public License version 2 or later + +""" # 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 # the Free Software Foundation; either version 2 of the License, or @@ -26,15 +31,13 @@ ################################################################################ -import os, pg, sys +import os +import sys import apt_pkg -import daklib.database -import daklib.utils - -################################################################################ -Cnf = None -projectB = None +from daklib.config import Config +from daklib.ls import list_packages +from daklib import utils ################################################################################ @@ -51,17 +54,16 @@ Display information about PACKAGE(s). -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 + -f, --format=control-suite use same format as control-suite for output ARCH, COMPONENT and SUITE can be comma (or space) separated lists, e.g. - --architecture=m68k,i386""" + --architecture=amd64,i386""" sys.exit(exit_code) ################################################################################ def main (): - global Cnf, projectB - - Cnf = daklib.utils.get_conf() + cnf = Config() Arguments = [('a', "architecture", "Ls::Options::Architecture", "HasArg"), ('b', "binarytype", "Ls::Options::BinaryType", "HasArg"), @@ -76,126 +78,54 @@ def main (): for i in [ "architecture", "binarytype", "component", "format", "greaterorequal", "greaterthan", "regex", "suite", "source-and-binary", "help" ]: - if not Cnf.has_key("Ls::Options::%s" % (i)): - Cnf["Ls::Options::%s" % (i)] = "" + if not cnf.has_key("Ls::Options::%s" % (i)): + cnf["Ls::Options::%s" % (i)] = "" - packages = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Ls::Options") + packages = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv) + Options = cnf.subtree("Ls::Options") if Options["Help"]: usage() if not packages: - daklib.utils.fubar("need at least one package name as an argument.") - - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - daklib.database.init(Cnf, projectB) + utils.fubar("need at least one package name as an argument.") # If cron.daily is running; warn the user that our output might seem strange - if os.path.exists(os.path.join(Cnf["Dir::Root"], "Archive_Maintenance_In_Progress")): - daklib.utils.warn("Archive maintenance is in progress; database inconsistencies are possible.") + if os.path.exists(os.path.join(cnf["Dir::Lock"], "daily.lock")): + utils.warn("Archive maintenance is in progress; database inconsistencies are possible.") # Handle buildd maintenance helper options if Options["GreaterOrEqual"] or Options["GreaterThan"]: if Options["GreaterOrEqual"] and Options["GreaterThan"]: - daklib.utils.fubar("-g/--greaterorequal and -G/--greaterthan are mutually exclusive.") + utils.fubar("-g/--greaterorequal and -G/--greaterthan are mutually exclusive.") if not Options["Suite"]: Options["Suite"] = "unstable" - # Parse -a/--architecture, -c/--component and -s/--suite - (con_suites, con_architectures, con_components, check_source) = \ - daklib.utils.parse_args(Options) - - if Options["BinaryType"]: - if Options["BinaryType"] != "udeb" and Options["BinaryType"] != "deb": - daklib.utils.fubar("Invalid binary type. 'udeb' and 'deb' recognised.") - con_bintype = "AND b.type = '%s'" % (Options["BinaryType"]) - # REMOVE ME TRAMP - if Options["BinaryType"] == "udeb": - check_source = 0 - else: - con_bintype = "" + kwargs = dict() if Options["Regex"]: - comparison_operator = "~" - else: - comparison_operator = "=" - + kwargs['regex'] = True if Options["Source-And-Binary"]: - new_packages = [] - for package in packages: - q = projectB.query("SELECT DISTINCT b.package FROM binaries b, bin_associations ba, suite su, source s WHERE b.source = s.id AND su.id = ba.suite AND b.id = ba.bin AND s.source %s '%s' %s" % (comparison_operator, package, con_suites)) - new_packages.extend([ i[0] for i in q.getresult() ]) - if package not in new_packages: - 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, c.name, m.name - FROM binaries b, architecture a, suite su, bin_associations ba, - files f, location l, component c, maintainer m - WHERE b.package %s '%s' AND a.id = b.architecture AND su.id = ba.suite - AND b.id = ba.bin AND b.file = f.id AND f.location = l.id - AND l.component = c.id AND b.maintainer = m.id %s %s %s -""" % (comparison_operator, package, con_suites, con_architectures, con_bintype)) - ql = q.getresult() - if check_source: - q = projectB.query(""" -SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name - FROM source s, suite su, src_associations sa, files f, location l, - component c, maintainer m - WHERE s.source %s '%s' AND su.id = sa.suite AND s.id = sa.source - AND s.file = f.id AND f.location = l.id AND l.component = c.id - AND s.maintainer = m.id %s -""" % (comparison_operator, package, con_suites)) - ql.extend(q.getresult()) - d = {} - highver = {} - for i in ql: - results += 1 - (pkg, version, architecture, suite, component, maintainer) = i - if component != "main": - suite = "%s/%s" % (suite, component) - if not d.has_key(pkg): - d[pkg] = {} - highver.setdefault(pkg,"") - if not d[pkg].has_key(version): - d[pkg][version] = {} - if apt_pkg.VersionCompare(version, highver[pkg]) > 0: - highver[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: - arches = d[pkg][version][suite] - arches.sort(daklib.utils.arch_compare_sw) - if Options["Format"] == "": #normal - sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite)) - sys.stdout.write(", ".join(arches)) - sys.stdout.write('\n') - elif Options["Format"] == "control-suite": - for arch in arches: - sys.stdout.write("%s %s %s\n" % (pkg, version, arch)) - if Options["GreaterOrEqual"]: - print "\n%s (>= %s)" % (pkg, highver[pkg]) - if Options["GreaterThan"]: - print "\n%s (>> %s)" % (pkg, highver[pkg]) - - if not results: - sys.exit(1) - -####################################################################################### + kwargs['source_and_binary'] = True + if Options["Suite"]: + kwargs['suites'] = utils.split_args(Options['Suite']) + if Options["Architecture"]: + kwargs['architectures'] = utils.split_args(Options['Architecture']) + if Options['BinaryType']: + kwargs['binary_types'] = utils.split_args(Options['BinaryType']) + if Options['Component']: + kwargs['components'] = utils.split_args(Options['Component']) + + if Options['Format']: + kwargs['format'] = Options['Format'] + if Options['GreaterOrEqual']: + kwargs['highest'] = '>=' + elif Options['GreaterThan']: + kwargs['highest'] = '>>' + + for line in list_packages(packages, **kwargs): + print line + +###################################################################################### if __name__ == '__main__': main() -