X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=ab8993a1a4d5305f58237f7434b22754426b1fd2;hb=b46b317a6c609971564f0a7dc70db85a47743756;hp=a18b1b19ce373f8a6bf41bece2d108a53c44a4c1;hpb=167f054a40037e9ba1ba6a30ae6ff57b4a776355;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index a18b1b19..ab8993a1 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -36,6 +36,8 @@ import daklib.queue
 import daklib.utils
 
 from types import *
+from syck import *
+
 
 ################################################################################
 
@@ -387,7 +389,8 @@ def check_files():
 
     for file in file_keys:
         # Ensure the file does not already exist in one of the accepted directories
-        for dir in [ "Accepted", "Byhand", "New", "ProposedUpdates", "OldProposedUpdates" ]:
+        for dir in [ "Accepted", "Byhand", "New", "ProposedUpdates", "OldProposedUpdates", "Embargoed", "Unembargoed" ]:
+	    if not Cnf.has_key("Dir::Queue::%s" % (dir)): continue
             if os.path.exists(Cnf["Dir::Queue::%s" % (dir) ]+'/'+file):
                 reject("%s file already exists in the %s directory." % (file, dir))
         if not daklib.utils.re_taint_free.match(file):
@@ -404,7 +407,7 @@ def check_files():
             files[file]["type"] = "unreadable"
             continue
         # If it's byhand skip remaining checks
-        if files[file]["section"] == "byhand" or files[file]["section"][4:] == "raw-":
+        if files[file]["section"] == "byhand" or files[file]["section"][:4] == "raw-":
             files[file]["byhand"] = 1
             files[file]["type"] = "byhand"
         # Checks for a binary package...
@@ -1138,6 +1141,79 @@ def upload_too_new():
     os.chdir(cwd)
     return too_new
 
+################################################################################
+################################################################################
+
+# We reject packages if the release team defined a transition for them
+def check_transition():
+    to_dump = 0
+
+    # Only check if there is a file defined with checks. It's a little bit
+    # specific to Debian, not much use for others, so return early there.
+    if not Cnf.has_key("Dinstall::Reject::ReleaseTransitions"):
+        return
+    
+    # No need to do anything if this upload has no source included
+    if not changes["architecture"].has_key("source"):
+        return
+
+    # We first load the current set of transitions, if any
+    if not os.path.exists("%s" % (Cnf["Dinstall::Reject::ReleaseTransitions"])):
+        # Nothing to do, no file exists
+        return
+    # Parse the yaml file
+    sourcefile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'r')
+    transitions = load(sourcefile)
+
+    # Now look through all defined transitions
+    for trans in transition:
+        t = transition[trans]
+        # We check if the transition is still valid
+        # If not we remove the whole setting from the dictionary and later dump it,
+        # so we don't process it again.
+        source = t["source"]
+        new_vers = t["new"]
+        q = Upload.projectB.query("""
+        SELECT s.version FROM source s, suite su, src_associations sa
+        WHERE sa.source=s.id
+          AND sa.suite=su.id
+          AND su.suite_name='testing'
+          AND s.source='%s'"""
+                                % (source))
+        ql = q.getresult()
+        if ql:
+            current_vers = ql[0][0]
+        if apt_pkg.VersionCompare(new_vers, current_vers) == 1:
+            # This is still valid, the current version in database is older than
+            # the new version we wait for
+
+            # Check if the source we look at is affected by this.
+            if changes["source"] in t['packages']:
+                # The source is affected, lets reject it.
+                reject("""%s: part of the %s transition.
+
+                Your package is part of a testing transition to get %s migrated.
+
+                Transition reason: %s
+
+                This transition will finish when %s, version %s, reaches testing.
+                This transition is managed by the Release Team and %s
+                is the Release-Team member responsible for it.
+                Please contact them or debian-release@lists.debian.org if you
+                need further assistance.
+                """
+                       % (changes["source"], trans, source, t["reason"], source, new_vers, t["rm"]))
+                return 0
+        else:
+            # We either have the wanted or a newer version in testing, or the package got
+            # removed completly. In that case we don't need to keep the transition blocker
+            del transition[trans]
+            to_dump = 1
+
+    if to_dump:
+        destfile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'w')
+        dump(transition, destfile)
+
 ################################################################################
 
 def action ():
@@ -1284,7 +1360,8 @@ def queue_unembargo (summary, short_summary):
 ################################################################################
 
 def is_embargo ():
-    return 0
+    # if embargoed queues are enabled always embargo
+    return 1
 
 def queue_embargo (summary, short_summary):
     print "Moving to EMBARGOED holding area."
@@ -1520,6 +1597,7 @@ def process_it (changes_file):
                 check_urgency()
                 check_timestamps()
                 check_signed_by_key()
+                check_transition()
         Upload.update_subst(reject_message)
         action()
     except SystemExit: