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
################################################################################
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")
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
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"]:
if __name__ == '__main__':
main()
-