X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fls.py;h=79f417fd3cb53874d8845368414e21e3b48553a1;hb=7634c6b12df2eaf14e4b07e27222c87cb740268d;hp=4eb8e8c8da9b4625442a635cdb6ab68310df5649;hpb=1c35448b880358d020e81339657e3435fdda9434;p=dak.git

diff --git a/dak/ls.py b/dak/ls.py
index 4eb8e8c8..79f417fd 100755
--- a/dak/ls.py
+++ b/dak/ls.py
@@ -56,7 +56,7 @@ Display information about PACKAGE(s).
   -S, --source-and-binary    show info for the binary children of source pkgs
 
 ARCH, COMPONENT and SUITE can be comma (or space) separated lists, e.g.
-    --architecture=m68k,i386"""
+    --architecture=amd64,i386"""
     sys.exit(exit_code)
 
 ################################################################################
@@ -80,8 +80,8 @@ def main ():
         if not cnf.has_key("Ls::Options::%s" % (i)):
             cnf["Ls::Options::%s" % (i)] = ""
 
-    packages = apt_pkg.ParseCommandLine(cnf.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()
@@ -91,7 +91,7 @@ def main ():
     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
@@ -150,7 +150,10 @@ SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name
    AND s.file = f.id AND f.location = l.id AND l.component = c.id
    AND s.maintainer = m.id %s
 """ % (comparison_operator, con_suites), {'package': package})
-            ql.extend(q.fetchall())
+            if not Options["Architecture"] or con_architectures:
+                ql.extend(q.fetchall())
+            else:
+                ql = q.fetchall()
         d = {}
         highver = {}
         for i in ql:
@@ -163,7 +166,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] = []
@@ -173,7 +176,7 @@ SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name
         packages.sort()
         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()