Merge branch 'master' into dbtests

[dak.git] / dak / ls.py

diff --git a/dak/ls.py b/dak/ls.py
index 4eb8e8c8da9b4625442a635cdb6ab68310df5649..66e8d42751eba2714779610939a05f7a4704800d 100755 (executable)
--- 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)
 
 ################################################################################
@@ -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: