X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=cabdbf3f6f914738f2ad4bf0a6f14d9bf28578e4;hb=adc4e001c669e3519b18b493bb0ce7b882f6a3ac;hp=a40118d4969b8f90dbdb7252ce92355f0ab8ad35;hpb=a13bb1a6f59fe5f497b125da3764da72081a7ab2;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index a40118d4..cabdbf3f 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -224,7 +224,10 @@ def package_to_suite(u, suite):
         q = q.join(DBSource).filter_by(source=u.pkg.changes['source'])
         q = q.filter_by(version=u.pkg.changes['version']).limit(1)
 
-        if q.count() < 1:
+        # NB: Careful, this logic isn't what you would think it is
+        # Source is already in {old-,}proposed-updates so no need to hold
+        # Instead, we don't move to the holding area, we just do an ACCEPT
+        if q.count() > 0:
             ret = False
 
         s.close()
@@ -427,6 +430,7 @@ def acknowledge_new(u, summary, short_summary):
     if not Options["No-Mail"]:
         print "Sending new ack."
         template = os.path.join(cnf["Dir::Templates"], 'process-unchecked.new')
+        u.update_subst()
         u.Subst["__SUMMARY__"] = summary
         new_ack_message = utils.TemplateSubst(u.Subst, template)
         utils.send_mail(new_ack_message)
@@ -495,7 +499,7 @@ def process_it(changes_file):
             valid_changes_p = u.load_changes(changespath)
         else:
             valid_changes_p = False
-	    u.rejects.extend(rejects)
+            u.rejects.extend(rejects)
 
         if valid_changes_p:
             while u.reprocess: