X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue_install.py;h=d016c98638619ed9888333c6d8bf907d806a030f;hb=7f4d35fbb32109cc31edc50b054035e133e4bb52;hp=b4b0ee3c705fb49e77daa9c7be1cee9e8dd9763d;hpb=3d0f19ee4030700284db07b155d0f8d8d8f43f8b;p=dak.git

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
old mode 100644
new mode 100755
index b4b0ee3c..d016c986
--- a/daklib/queue_install.py
+++ b/daklib/queue_install.py
@@ -72,7 +72,6 @@ def package_to_queue(u, summary, short_summary, queue, chg, session, announce=No
     if announce:
         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)
@@ -166,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
 
@@ -188,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
@@ -255,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