X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fls.py;h=b9753b483e265303246ac6e533059c550790ec93;hb=0d80b258098ff470433efa4d9c1f81b404883195;hp=9f7b556681487a4a1fedfe916e37e78d03ede201;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git

diff --git a/dak/ls.py b/dak/ls.py
index 9f7b5566..b9753b48 100755
--- a/dak/ls.py
+++ b/dak/ls.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 
-# Display information about package(s) (suite, version, etc.)
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005  James Troup <james@nocrew.org>
-# $Id: madison,v 1.33 2005-11-15 09:50:32 ajt Exp $
+""" Display information about package(s) (suite, version, etc.) """
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006  James Troup <james@nocrew.org>
 
 # 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
@@ -28,8 +27,9 @@
 ################################################################################
 
 import os, pg, sys
-import utils, db_access
 import apt_pkg
+from daklib import database
+from daklib import utils
 
 ################################################################################
 
@@ -39,7 +39,7 @@ projectB = None
 ################################################################################
 
 def usage (exit_code=0):
-    print """Usage: madison [OPTION] PACKAGE[...]
+    print """Usage: dak ls [OPTION] PACKAGE[...]
 Display information about PACKAGE(s).
 
   -a, --architecture=ARCH    only show info for ARCH(s)
@@ -63,24 +63,24 @@ def main ():
 
     Cnf = utils.get_conf()
 
-    Arguments = [('a', "architecture", "Madison::Options::Architecture", "HasArg"),
-                 ('b', "binarytype", "Madison::Options::BinaryType", "HasArg"),
-                 ('c', "component", "Madison::Options::Component", "HasArg"),
-                 ('f', "format", "Madison::Options::Format", "HasArg"),
-                 ('g', "greaterorequal", "Madison::Options::GreaterOrEqual"),
-                 ('G', "greaterthan", "Madison::Options::GreaterThan"),
-                 ('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")]
+    Arguments = [('a', "architecture", "Ls::Options::Architecture", "HasArg"),
+                 ('b', "binarytype", "Ls::Options::BinaryType", "HasArg"),
+                 ('c', "component", "Ls::Options::Component", "HasArg"),
+                 ('f', "format", "Ls::Options::Format", "HasArg"),
+                 ('g', "greaterorequal", "Ls::Options::GreaterOrEqual"),
+                 ('G', "greaterthan", "Ls::Options::GreaterThan"),
+                 ('r', "regex", "Ls::Options::Regex"),
+                 ('s', "suite", "Ls::Options::Suite", "HasArg"),
+                 ('S', "source-and-binary", "Ls::Options::Source-And-Binary"),
+                 ('h', "help", "Ls::Options::Help")]
     for i in [ "architecture", "binarytype", "component", "format",
                "greaterorequal", "greaterthan", "regex", "suite",
                "source-and-binary", "help" ]:
-	if not Cnf.has_key("Madison::Options::%s" % (i)):
-	    Cnf["Madison::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("Madison::Options")
+    Options = Cnf.SubTree("Ls::Options")
 
     if Options["Help"]:
         usage()
@@ -88,7 +88,7 @@ def main ():
         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)
+    database.init(Cnf, projectB)
 
     # 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")):
@@ -124,7 +124,7 @@ def main ():
         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(map(lambda x: x[0], q.getresult()))
+            new_packages.extend([ i[0] for i in q.getresult() ])
             if package not in new_packages:
                 new_packages.append(package)
         packages = new_packages
@@ -183,7 +183,7 @@ SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name
                         sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite))
                         sys.stdout.write(", ".join(arches))
                         sys.stdout.write('\n')
-                    elif Options["Format"] == "heidi":
+                    elif Options["Format"] in [ "control-suite", "heidi" ]:
                         for arch in arches:
                             sys.stdout.write("%s %s %s\n" % (pkg, version, arch))
             if Options["GreaterOrEqual"]:
@@ -198,4 +198,3 @@ SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name
 
 if __name__ == '__main__':
     main()
-