Merge commit 'stew/categorize-bts' into merge

[dak.git] / dak / ls.py

diff --git a/dak/ls.py b/dak/ls.py
index 670a7412f1745e05fe465b241f3b029aa840af37..b9753b483e265303246ac6e533059c550790ec93 100755 (executable)
--- a/dak/ls.py
+++ b/dak/ls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Display information about package(s) (suite, version, etc.)
+""" 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
@@ -28,8 +28,8 @@
 
 import os, pg, sys
 import apt_pkg
-import dak.lib.database as database
-import dak.lib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 
@@ -76,8 +76,8 @@ 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")
@@ -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"] == "control-suite":
+                    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()
-