X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fls.py;h=6ed845fe4fe41153501cabde9e2d963e94a4c8a6;hb=cc03060fe1f565dc37fd8db757b4a6973a698f46;hp=a1f8c8ec2dc1b52f15cb7b0d6f46011484446218;hpb=5ea129bba83114905c1266b77744eeed8e9bb020;p=dak.git diff --git a/dak/ls.py b/dak/ls.py old mode 100755 new mode 100644 index a1f8c8ec..6ed845fe --- a/dak/ls.py +++ b/dak/ls.py @@ -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") @@ -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() -