X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=7a49242284026ec39f12e5fe3d13928d46094819;hb=4830d9be143c7645ea932b53fae095e275ad7814;hp=2235f75110853f38acd9b4b7abd842ccf3bfde39;hpb=fd29e4a6834a0b9f1d0c604d174db6da0ac4d84d;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
index 2235f751..7a492422 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:
@@ -332,7 +332,7 @@ def prod_maintainer(notes, upload):
 
 ################################################################################
 
-def edit_note(note, upload, session):
+def edit_note(note, upload, session, trainee=False):
     # Write the current data to a temporary file
     (fd, temp_filename) = utils.temp_filename()
     editor = os.environ.get("EDITOR","vi")
@@ -364,7 +364,7 @@ def edit_note(note, upload, session):
     comment.version = upload.pkg.changes["version"]
     comment.comment = newnote
     comment.author  = utils.whoami()
-    comment.trainee = bool(Options["Trainee"])
+    comment.trainee = trainee
     session.add(comment)
     session.commit()
 
@@ -805,7 +805,7 @@ class Upload(object):
                     entry["new"] = 1
                 else:
                     dsc_file_exists = False
-                    for myq in ["Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates", "Lenny-Volatile-Proposed-Updates"]:
+                    for myq in ["Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates"]:
                         if cnf.has_key("Dir::Queue::%s" % (myq)):
                             if os.path.exists(os.path.join(cnf["Dir::Queue::" + myq], dsc_filename)):
                                 dsc_file_exists = True
@@ -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
@@ -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)