Merge branch 'master' into merge

* master:
  let's not reset last_used every time...
  old

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index dc4f019722dcdefc5267b49b485715a2906d0937..7ea90b8254cacadadd1d6d9b368bd7141b5b6bd2 100755 (executable)
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -163,6 +163,7 @@ def check_files(now_date, delete_date, max_delete, session):
 SELECT id, filename FROM files f
   WHERE NOT EXISTS (SELECT 1 FROM binaries b WHERE b.file = f.id)
     AND NOT EXISTS (SELECT 1 FROM dsc_files df WHERE df.file = f.id)
+    AND last_used IS NULL
     ORDER BY filename""")
 
     ql = q.fetchall()

diff --git a/daklib/queue.py b/daklib/queue.py
index d217d7e4c39a836f7a0530eb402653e4a1e0b2e6..b3247ee1924c1f8188bfae42105eb77387efb41c 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1000,11 +1000,6 @@ class Upload(object):
         for field_name in [ "build-depends", "build-depends-indep" ]:
             field = self.pkg.dsc.get(field_name)
             if field:
-                # Check for broken dpkg-dev lossage...
-                if field.startswith("ARRAY"):
-                    self.rejects.append("%s: invalid %s field produced by a broken version of dpkg-dev (1.10.11)" % \
-                                        (dsc_filename, field_name.title()))
-
                 # Have apt try to parse them...
                 try:
                     apt_pkg.ParseSrcDepends(field)