X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=dec339af60c310940bb09febd921c8f503b048cd;hb=e60e50250af1b4b9eaa6c5772c28d96a554284e4;hp=305d4838f985990137eb41c8c8ece58cca90e80d;hpb=b637b9219808c49d717ed9156debb8fbb55b5e3e;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
index 305d4838..dec339af 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -171,8 +171,8 @@ def determine_new(filename, changes, files, warn=1, session = None):
             newsuite = get_suite(oldsuite.overridesuite, session)
 
             if newsuite:
-                print "WARNING: overriding suite %s to suite %s" % (
-                    suite, oldsuite.overridesuite)
+                print "INFORMATION: Using overrides from suite %s instead of suite %s" % (
+                    oldsuite.overridesuite, suite)
                 del changes["suite"][suite]
                 changes["suite"][oldsuite.overridesuite] = 1
             else:
@@ -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)