Merge branch 'master' into security

[dak.git] / daklib / queue_install.py

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
index 1671c721e5ad53a8910e006aac77a933d3ec2424..80787b5cb411c533bf243fa3ceb55c05925c5cc5 100755 (executable)
--- a/daklib/queue_install.py
+++ b/daklib/queue_install.py
@@ -114,7 +114,7 @@ def is_unembargo(u):
 
    return ret
 
-def queue_unembargo(u, summary, short_summary, session=None):
+def do_unembargo(u, summary, short_summary, chg, session=None):
     return package_to_queue(u, summary, short_summary,
                             get_policy_queue('disembargo'), chg, session,
                             announce=None)
@@ -127,7 +127,7 @@ def is_embargo(u):
    if get_policy_queue('embargo'):
        return True
 
-def queue_embargo(u, summary, short_summary, session=None):
+def do_embargo(u, summary, short_summary, chg, session=None):
     return package_to_queue(u, summary, short_summary,
                             get_policy_queue('embargo'), chg, session,
                             announce=None)
@@ -251,13 +251,15 @@ def acknowledge_new(u, summary, short_summary, chg, session):
 
 ################################################################################
 
+# FIXME: queues should be able to get autobuild
+#        the current logic doesnt allow this, as buildd stuff is AFTER accept...
 # 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 },
-    "embargoed" : { "is": is_embargoed, "process": do_embargoed },
-    "unembargoed" : { "is": is_unembargoed, "process": do_unembargoed },
+    "embargoed" : { "is": is_embargo, "process": do_embargo },
+    "unembargoed" : { "is": is_unembargo, "process": do_unembargo },
 }
 
 def determine_target(u):