X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue_install.py;h=d016c98638619ed9888333c6d8bf907d806a030f;hb=fa0e8a21b006b05ea56a8fb2a0c57006f6715217;hp=912fdcbb6c6862ccded879592e4cf1a262dcfc9f;hpb=0933fbc6c1cb7f84f143aaa6ca0aedfb83fb628c;p=dak.git

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
old mode 100644
new mode 100755
index 912fdcbb..d016c986
--- a/daklib/queue_install.py
+++ b/daklib/queue_install.py
@@ -69,12 +69,12 @@ def package_to_queue(u, summary, short_summary, queue, chg, session, announce=No
     u.check_override()
 
     # Send accept mail, announce to lists and close bugs
-    template = os.path.join(cnf["Dir::Templates"], announce)
-    u.update_subst()
-    u.Subst["__SUITE__"] = ""
-    mail_message = utils.TemplateSubst(u.Subst, template)
-    utils.send_mail(mail_message)
-    u.announce(short_summary, True)
+    if announce:
+        template = os.path.join(cnf["Dir::Templates"], announce)
+        u.update_subst()
+        mail_message = utils.TemplateSubst(u.Subst, template)
+        utils.send_mail(mail_message)
+        u.announce(short_summary, True)
 
 ################################################################################
 
@@ -165,7 +165,7 @@ def is_autobyhand(u):
 
 def do_autobyhand(u, summary, short_summary, chg, session):
     print "Attempting AUTOBYHAND."
-    byhandleft = True
+    byhandleft = False
     for f, entry in u.pkg.files.items():
         byhandfile = f
 
@@ -187,7 +187,7 @@ def do_autobyhand(u, summary, short_summary, chg, session):
 
         if result == 0:
             os.unlink(byhandfile)
-            del entry
+            del u.pkg.files[f]
         else:
             print "Error processing %s, left as byhand." % (f)
             byhandleft = True
@@ -254,7 +254,7 @@ def determine_target(u):
     # Statically handled queues
     target = None
 
-    for q in ["new", "autobyhand", "byhand"]:
+    for q in ["autobyhand", "byhand", "new"]:
         if QueueInfo[q]["is"](u):
             target = q
             break