Fix various errors caused by moving stuff around

[dak.git] / daklib / queue_install.py

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
index 40f0304e8228c72e5cbc49399324e294caddaad4..5599661bc1fe77530c48b2759962da746865b0ff 100644 (file)
--- a/daklib/queue_install.py
+++ b/daklib/queue_install.py
@@ -25,22 +25,14 @@ Utility functions for process-upload
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import os
+
+from daklib import utils
+from daklib.dbconn import *
 from daklib.config import Config
 
 ###############################################################################
 
-# q-unapproved hax0ring
-QueueInfo = {
-    "New": { "is": is_new, "process": acknowledge_new },
-    "Autobyhand" : { "is" : is_autobyhand, "process": do_autobyhand },
-    "Byhand" : { "is": is_byhand, "process": do_byhand },
-    "OldStableUpdate" : { "is": is_oldstableupdate,
-                          "process": do_oldstableupdate },
-    "StableUpdate" : { "is": is_stableupdate, "process": do_stableupdate },
-    "Unembargo" : { "is": is_unembargo, "process": queue_unembargo },
-    "Embargo" : { "is": is_embargo, "process": queue_embargo },
-}
-
 def determine_target(u):
     cnf = Config()
     
@@ -88,9 +80,8 @@ def package_to_queue(u, summary, short_summary, queue, perms=0660, build=True, a
     dir = cnf["Dir::Queue::%s" % queue]
 
     print "Moving to %s holding area" % queue.upper()
-    Logger.log(["Moving to %s" % queue, u.pkg.changes_file])
+    u.logger.log(["Moving to %s" % queue, u.pkg.changes_file])
 
-    u.pkg.write_dot_dak(dir)
     u.move_to_dir(dir, perms=perms)
     if build:
         get_or_set_queue(queue.lower()).autobuild_upload(u.pkg, dir)
@@ -127,9 +118,8 @@ def is_unembargo(u):
 
     if u.pkg.directory == disdir:
         if u.pkg.changes["architecture"].has_key("source"):
-            if not Options["No-Action"]:
-                session.execute("INSERT INTO disembargo (package, version) VALUES (:package, :version)", u.pkg.changes)
-                session.commit()
+            session.execute("INSERT INTO disembargo (package, version) VALUES (:package, :version)", u.pkg.changes)
+            session.commit()
 
             ret = True
 
@@ -270,16 +260,29 @@ def is_new(u):
 def acknowledge_new(u, summary, short_summary):
     cnf = Config()
 
-    print "Moving to NEW holding area."
-    Logger.log(["Moving to new", u.pkg.changes_file])
+    print "Moving to NEW queue."
+    u.logger.log(["Moving to new", u.pkg.changes_file])
 
-    u.pkg.write_dot_dak(cnf["Dir::Queue::New"])
     u.move_to_dir(cnf["Dir::Queue::New"], perms=0640, changesperms=0644)
 
-    if not Options["No-Mail"]:
+    if not cnf["Dinstall::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)
+
+################################################################################
+
+# q-unapproved hax0ring
+QueueInfo = {
+    "New": { "is": is_new, "process": acknowledge_new },
+    "Autobyhand" : { "is" : is_autobyhand, "process": do_autobyhand },
+    "Byhand" : { "is": is_byhand, "process": do_byhand },
+    "OldStableUpdate" : { "is": is_oldstableupdate,
+                          "process": do_oldstableupdate },
+    "StableUpdate" : { "is": is_stableupdate, "process": do_stableupdate },
+    "Unembargo" : { "is": is_unembargo, "process": queue_unembargo },
+    "Embargo" : { "is": is_embargo, "process": queue_embargo },
+}