use the right var name, stupid

[dak.git] / daklib / queue_install.py

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
index 1671c721e5ad53a8910e006aac77a933d3ec2424..b273536058c603c5bc487d32d33fa4377a9f5716 100755 (executable)
--- a/daklib/queue_install.py
+++ b/daklib/queue_install.py
@@ -87,6 +87,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"]})
@@ -103,7 +109,7 @@ def is_unembargo(u):
 
    if u.pkg.directory == disdir:
        if u.pkg.changes["architecture"].has_key("source"):
-           session.execute("INSERT INTO disembargo (package, version) VALUES (:package, :version)",
+           session.execute("INSERT INTO disembargo (package, version) VALUES (:source, :version)",
                            {'source': u.pkg.changes["source"],
                             'version': u.pkg.changes["version"]})
            session.commit()
@@ -114,23 +120,42 @@ 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))
 #
 #################################################################################
 #
 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 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 +276,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):