X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue_install.py;h=d53887863176972b54e7fe652eac70dbc429bb5e;hb=93c168458fc76a264c91fd4453f780bc18c40c60;hp=1671c721e5ad53a8910e006aac77a933d3ec2424;hpb=db4d3b713caf2fdc24b44d08214a6a9b1b006f17;p=dak.git

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
index 1671c721..d5388786 100755
--- a/daklib/queue_install.py
+++ b/daklib/queue_install.py
@@ -114,10 +114,16 @@ def is_unembargo(u):
 
    return ret
 
-def queue_unembargo(u, summary, short_summary, session=None):
-    return package_to_queue(u, summary, short_summary,
-                            get_policy_queue('disembargo'), chg, session,
-                            announce=None)
+def do_unembargo(u, summary, short_summary, chg, session=None):
+    polq=get_policy_queue('disembargo')
+    package_to_queue(u, summary, short_summary,
+                     polq, chg, session,
+                     announce=None)
+    for suite_name in u.pkg.changes["distribution"].keys():
+        suite = get_suite(suite_name, session)
+        for q in suite.copy_queues:
+            for f in u.pkg.files.keys():
+                os.symlink(os.path.join(polq.path, f), os.path.join(q.path, f))
 #
 #################################################################################
 #
@@ -127,10 +133,16 @@ def is_embargo(u):
    if get_policy_queue('embargo'):
        return True
 
-def queue_embargo(u, summary, short_summary, session=None):
-    return package_to_queue(u, summary, short_summary,
-                            get_policy_queue('embargo'), chg, session,
-                            announce=None)
+def do_embargo(u, summary, short_summary, chg, session=None):
+    polq=get_policy_queue('embargo')
+    package_to_queue(u, summary, short_summary,
+                     polq, chg, session,
+                     announce=None)
+    for suite_name in u.pkg.changes["distribution"].keys():
+        suite = get_suite(suite_name, session)
+        for q in suite.copy_queues:
+            for f in u.pkg.files.keys():
+                os.symlink(os.path.join(polq.path, f), os.path.join(q.path, f))
 
 ################################################################################
 
@@ -251,13 +263,16 @@ 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...
+#        embargo/disembargo use a workaround due to this
 # 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):