Merge branch 'master' into security

* master:
  do is a little different than queue, even if just a tiny bit
  better function names

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
index 1671c721e5ad53a8910e006aac77a933d3ec2424..d33ffcce22d586acaa230f2be91d427f98b6aa17 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, 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, session=None):
     return package_to_queue(u, summary, short_summary,
                             get_policy_queue('embargo'), chg, session,
                             announce=None)
@@ -256,8 +256,8 @@ 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):