Merge remote-tracking branch 'nthykier/auto-decruft'

[dak.git] / dak / update_suite.py

diff --git a/dak/update_suite.py b/dak/update_suite.py
index cfca52a6aa7d13d7cf2a5efc106cdc8d6ecc599e..6043dd2ccb9403b148ca6b3f73035c0dfce0a890 100644 (file)
--- a/dak/update_suite.py
+++ b/dak/update_suite.py
@@ -187,6 +187,8 @@ class SuiteUpdater(object):
                       .filter(ArchiveFile.archive_id == suite.archive_id)
 
     def install_binaries(self, binaries, suite):
+        if len(binaries) == 0:
+            return
         # If origin and target suites are in the same archive, we can skip the
         # overhead from ArchiveTransaction.copy_binary()
         if self.origin.archive_id == suite.archive_id:
@@ -207,6 +209,8 @@ class SuiteUpdater(object):
                       .filter(ArchiveFile.archive_id == suite.archive_id)
 
     def install_sources(self, sources, suite):
+        if len(sources) == 0:
+            return
         # If origin and target suites are in the same archive, we can skip the
         # overhead from ArchiveTransaction.copy_source()
         if self.origin.archive_id == suite.archive_id:
@@ -222,7 +226,7 @@ class SuiteUpdater(object):
     def update_suite(self):
         targets = set([self.target])
         if self.obey_build_queues:
-            targets.update(self.target.copy_queues)
+            targets.update([bq.suite for bq in self.target.copy_queues])
         target_names = [ s.suite_name for s in targets ]
         target_names.sort()
         target_name = ",".join(target_names)