Fix error with qa, as we send mail to removed-packages@qa... twice

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index 305d4838f985990137eb41c8c8ece58cca90e80d..3bf0a72ad77a376ef18119eeee5579b811e999f6 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1918,6 +1918,7 @@ distribution."""
 
         for dist in self.pkg.changes["distribution"].keys():
             suite = get_suite(dist)
+            if suite is None: continue
             announce_list = suite.announce
             if announce_list == "" or lists_done.has_key(announce_list):
                 continue
@@ -2056,7 +2057,7 @@ distribution."""
 
         # Copy the .changes file across for suite which need it.
         copy_changes = dict([(x.copychanges, '')
-                             for x in session.query(Suite).filter(Suite.suite_name.in_([self.pkg.changes["distribution"].keys()])).all()
+                             for x in session.query(Suite).filter(Suite.suite_name.in_(self.pkg.changes["distribution"].keys())).all()
                              if x.copychanges is not None])
 
         for dest in copy_changes.keys():
@@ -2366,7 +2367,7 @@ distribution."""
 
         # Override suite name; used for example with proposed-updates
         oldsuite = get_suite(suite, session)
-        if oldsuite.overridesuite:
+        if (not oldsuite is None) and oldsuite.overridesuite:
             suite = oldsuite.overridesuite
 
         result = get_override(package, suite, component, file_type, session)