X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=e39b72d690e0a85d46db6b1fe8808d0ccc04aecf;hb=bfb0bebe865f73949ff67c0156fdd9d63282c318;hp=d97b99f580df526dcdee93e66be4a8e0912ce5c5;hpb=13f7dfde42b50070414e052d795402a89c8c937b;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
old mode 100644
new mode 100755
index d97b99f5..e39b72d6
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -820,7 +820,7 @@ class Upload(object):
             # if in the pool or in a queue other than unchecked, reject
             if (dbc.in_queue is None) \
                    or (dbc.in_queue is not None
-                       and dbc.in_queue.queue_name != 'unchecked'):
+                       and dbc.in_queue.queue_name not in ["unchecked", "newstage"]):
                 self.rejects.append("%s file already known to dak" % base_filename)
         except NoResultFound, e:
             # not known, good
@@ -2139,6 +2139,7 @@ distribution."""
             user_email_address = utils.whoami() + " <%s>" % (cnf["Dinstall::MyAdminAddress"])
             self.Subst["__REJECTOR_ADDRESS__"] = user_email_address
             self.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message
+            self.Subst["__REJECT_MESSAGE__"] = ""
             self.Subst["__CC__"] = "Cc: " + cnf["Dinstall::MyEmailAddress"]
             reject_mail_message = utils.TemplateSubst(self.Subst, rej_template)
             # Write the rejection email out as the <foo>.reason file