# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
+from shutil import copyfile
from daklib import utils
from daklib.dbconn import *
################################################################################
def package_to_suite(u, suite_name, session):
- if not u.pkg.changes["distribution"].has_key(suite_name):
+ if suite_name not in u.pkg.changes["distribution"]:
return False
- ret = True
+ if 'source' in u.pkg.changes["architecture"]:
+ return True
- if not u.pkg.changes["architecture"].has_key("source"):
- q = session.query(SrcAssociation.sa_id)
- q = q.join(Suite).filter_by(suite_name=suite_name)
- q = q.join(DBSource).filter_by(source=u.pkg.changes['source'])
- q = q.filter_by(version=u.pkg.changes['version']).limit(1)
+ q = session.query(Suite).filter_by(suite_name = suite_name). \
+ filter(Suite.sources.any( \
+ source = u.pkg.changes['source'], \
+ version = u.pkg.changes['version']))
- # NB: Careful, this logic isn't what you would think it is
- # Source is already in the target suite so no need to go to policy
- # Instead, we don't move to the policy area, we just do an ACCEPT
- if q.count() > 0:
- ret = False
-
- return ret
+ # NB: Careful, this logic isn't what you would think it is
+ # Source is already in the target suite so no need to go to policy
+ # Instead, we don't move to the policy area, we just do an ACCEPT
+ if q.count() > 0:
+ return False
+ else:
+ return True
def package_to_queue(u, summary, short_summary, queue, chg, session, announce=None):
cnf = Config()
u.move_to_queue(queue)
chg.in_queue_id = queue.policy_queue_id
session.add(chg)
+
+ # send to build queues
+ if queue.send_to_build_queues:
+ for suite_name in u.pkg.changes["distribution"].keys():
+ suite = get_suite(suite_name, session)
+ for q in suite.copy_queues:
+ q.add_changes_from_policy_queue(queue, chg)
+
session.commit()
# Check for override disparities
################################################################################
-# TODO: This logic needs to be replaced with policy queues before we upgrade
-# security master
+def is_unembargo(u):
+ session = DBConn().session()
-#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')
+ # If we dont have the disembargo queue we are not on security and so not interested
+ # in doing any security queue handling
+ disembargo_queue = get_policy_queue("unembargoed")
+ if not disembargo_queue:
+ 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
+
+ # Ensure we don't have a / on the end or something
+ disdir = os.path.abspath(disembargo_queue.path)
+
+ 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('unembargoed')
+ package_to_queue(u, summary, short_summary,
+ polq, chg, session,
+ announce=None)
#
#################################################################################
#
-#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('embargoed'):
+ 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('embargoed')
+ package_to_queue(u, summary, short_summary,
+ polq, chg, session,
+ announce=None)
################################################################################
all_auto = 0
continue
- ABH = cnf.SubTree("AutomaticByHandPackages")
+ ABH = cnf.subtree("AutomaticByHandPackages")
if not ABH.has_key(pckg) or \
ABH["%s::Source" % (pckg)] != u.pkg.changes["source"]:
print "not match %s %s" % (pckg, u.pkg.changes["source"])
################################################################################
+# 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 ["autobyhand", "byhand", "new"]:
+ for q in ["autobyhand", "byhand", "new", "unembargoed", "embargoed"]:
if QueueInfo[q]["is"](u):
target = q
break
projects / dak.git / blobdiff