################################################################################
-# TODO: This logic needs to be replaced with policy queues before we upgrade
-# security master
-
-#def is_unembargo(u):
-# session = DBConn().session()
-# cnf = Config()
-#
-# q = session.execute("SELECT package FROM disembargo WHERE package = :source AND version = :version", u.pkg.changes)
-# if q.rowcount > 0:
-# session.close()
-# return True
-#
-# oldcwd = os.getcwd()
-# os.chdir(cnf["Dir::Queue::Disembargo"])
-# disdir = os.getcwd()
-# os.chdir(oldcwd)
-#
-# ret = False
-#
-# if u.pkg.directory == disdir:
-# if u.pkg.changes["architecture"].has_key("source"):
-# session.execute("INSERT INTO disembargo (package, version) VALUES (:package, :version)", u.pkg.changes)
-# session.commit()
-#
-# ret = True
-#
-# session.close()
-#
-# return ret
-#
-#def queue_unembargo(u, summary, short_summary, session=None):
-# return package_to_queue(u, summary, short_summary, "Unembargoed",
-# perms=0660, build=True, announce='process-unchecked.accepted')
+def is_unembargo(u):
+ session = DBConn().session()
+ cnf = Config()
+
+ # If we dont have the disembargo queue we are not on security and so not interested
+ # in doing any security queue handling
+ 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"]})
+ if q.rowcount > 0:
+ session.close()
+ return True
+
+ oldcwd = os.getcwd()
+ os.chdir(cnf["Dir::Queue::Disembargo"])
+ disdir = os.getcwd()
+ os.chdir(oldcwd)
+
+ ret = False
+
+ if u.pkg.directory == disdir:
+ if u.pkg.changes["architecture"].has_key("source"):
+ session.execute("INSERT INTO disembargo (package, version) VALUES (:source, :version)",
+ {'source': u.pkg.changes["source"],
+ 'version': u.pkg.changes["version"]})
+ session.commit()
+
+ ret = True
+
+ session.close()
+
+ return ret
+
+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 embargoed queues are enabled always embargo
-# return True
-#
-#def queue_embargo(u, summary, short_summary, session=None):
-# return package_to_queue(u, summary, short_summary, "Unembargoed",
-# perms=0660, build=True, announce='process-unchecked.accepted')
+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, 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))
################################################################################
################################################################################
+# 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_embargo, "process": do_embargo },
+ "unembargoed" : { "is": is_unembargo, "process": do_unembargo },
}
def determine_target(u):
# Statically handled queues
target = None
- for q in ["new", "autobyhand", "byhand"]:
+ for q in ["autobyhand", "byhand", "new", "unembargoed", "embargoed"]:
if QueueInfo[q]["is"](u):
target = q
break