X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dak%2Fls.py;h=f4ae00af1db22549d0a1189a92fbe5d724289969;hb=47cd096281f1cc36dfe9818ef1fbae8d02f6ada6;hp=69251eb47a6123b9e02bb1eb96d7b9bf87eedf5d;hpb=6a4cddfbe864e563e671fe5dabf5600c4783af5c;p=dak.git diff --git a/dak/ls.py b/dak/ls.py index 69251eb4..f4ae00af 100755 --- a/dak/ls.py +++ b/dak/ls.py @@ -32,16 +32,12 @@ Display information about package(s) (suite, version, etc.) ################################################################################ import os -import pg import sys import apt_pkg -from daklib import database -from daklib import utils - -################################################################################ -Cnf = None #: Configuration, apt_pkg.Configuration -projectB = None #: database connection, pgobject +from daklib.config import Config +from daklib.dbconn import * +from daklib import utils ################################################################################ @@ -58,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 = utils.get_conf() + cnf = Config() Arguments = [('a', "architecture", "Ls::Options::Architecture", "HasArg"), ('b', "binarytype", "Ls::Options::BinaryType", "HasArg"), @@ -83,22 +78,21 @@ 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: utils.fubar("need at least one package name as an argument.") - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - database.init(Cnf, projectB) + session = DBConn().session() # 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")): + 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 @@ -130,33 +124,37 @@ def main (): 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() ]) + q = session.execute("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 :package %s" % (comparison_operator, con_suites), + {'package': package}) + new_packages.extend([ i[0] for i in q.fetchall() ]) if package not in new_packages: new_packages.append(package) packages = new_packages results = 0 for package in packages: - q = projectB.query(""" + q = session.execute(""" 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() + files f, files_archive_map af, component c, maintainer m + WHERE b.package %s :package AND a.id = b.architecture AND su.id = ba.suite + AND b.id = ba.bin AND b.file = f.id AND af.file_id = f.id AND su.archive_id = af.archive_id + AND af.component_id = c.id AND b.maintainer = m.id %s %s %s +""" % (comparison_operator, con_suites, con_architectures, con_bintype), {'package': package}) + ql = q.fetchall() if check_source: - q = projectB.query(""" + q = session.execute(""" 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, + FROM source s, suite su, src_associations sa, files f, files_archive_map af, 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 + WHERE s.source %s :package AND su.id = sa.suite AND s.id = sa.source + AND s.file = f.id AND af.file_id = f.id AND af.archive_id = su.archive_id AND af.component_id = c.id AND s.maintainer = m.id %s -""" % (comparison_operator, package, con_suites)) - ql.extend(q.getresult()) +""" % (comparison_operator, con_suites), {'package': package}) + if not Options["Architecture"] or con_architectures: + ql.extend(q.fetchall()) + else: + ql = q.fetchall() d = {} highver = {} for i in ql: @@ -169,7 +167,7 @@ SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name highver.setdefault(pkg,"") if not d[pkg].has_key(version): d[pkg][version] = {} - if apt_pkg.VersionCompare(version, highver[pkg]) > 0: + if apt_pkg.version_compare(version, highver[pkg]) > 0: highver[pkg] = version if not d[pkg][version].has_key(suite): d[pkg][version][suite] = [] @@ -177,9 +175,22 @@ SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name packages = d.keys() packages.sort() + + # Calculate optimal column sizes + sizes = [10, 13, 10] + for pkg in packages: + versions = d[pkg].keys() + for version in versions: + suites = d[pkg][version].keys() + for suite in suites: + sizes[0] = max(sizes[0], len(pkg)) + sizes[1] = max(sizes[1], len(version)) + sizes[2] = max(sizes[2], len(suite)) + fmt = "%%%is | %%%is | %%%is | " % tuple(sizes) + for pkg in packages: versions = d[pkg].keys() - versions.sort(apt_pkg.VersionCompare) + versions.sort(apt_pkg.version_compare) for version in versions: suites = d[pkg][version].keys() suites.sort() @@ -187,7 +198,7 @@ SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name arches = d[pkg][version][suite] arches.sort(utils.arch_compare_sw) if Options["Format"] == "": #normal - sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite)) + sys.stdout.write(fmt % (pkg, version, suite)) sys.stdout.write(", ".join(arches)) sys.stdout.write('\n') elif Options["Format"] in [ "control-suite", "heidi" ]: