queue_install

[dak.git] / daklib / queue_install.py

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
index d33ffcce22d586acaa230f2be91d427f98b6aa17..78b827a51b5bd0a45852a1fa71458ef37e980186 100755 (executable)
--- a/daklib/queue_install.py
+++ b/daklib/queue_install.py
@@ -26,6 +26,7 @@ Utility functions for process-upload
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 import os
+from shutil import copy
 
 from daklib import utils
 from daklib.dbconn import *
@@ -87,6 +88,12 @@ def is_unembargo(u):
    if not get_policy_queue("disembargo"):
        return False
 
+   # If we already are in newstage, then it means this just got passed through and accepted
+   # by a security team member. Don't try to accept it for disembargo again
+   dbc = get_dbchange(u.pkg.changes_file, session)
+   if dbc and dbc.in_queue.queue_name in [ 'newstage' ]:
+       return False
+
    q = session.execute("SELECT package FROM disembargo WHERE package = :source AND version = :version",
                        {'source': u.pkg.changes["source"],
                         'version': u.pkg.changes["version"]})
@@ -114,23 +121,42 @@ def is_unembargo(u):
 
    return ret
 
-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)
+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():
+                copy(os.path.join(polq.path, f), q.path)
 #
 #################################################################################
 #
 def is_embargo(u):
    # if we are the security archive, we always have a embargo queue and its the
    # last in line, so if that exists, return true
+   # Of course do not return true when we accept from out of newstage, as that means
+   # it just left embargo and we want it in the archive
    if get_policy_queue('embargo'):
+       session = DBConn().session()
+       dbc = get_dbchange(u.pkg.changes_file, session)
+       if dbc and dbc.in_queue.queue_name in [ 'newstage' ]:
+           return False
+
        return True
 
-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)
+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():
+                copy(os.path.join(polq.path, f), q.path)
 
 ################################################################################
 
@@ -251,6 +277,9 @@ 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 },