Actually revert the move to daklib.queue, keep it in proces_unchecked.

[dak.git] / dak / process_unchecked.py

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index c3b5d2011c0306d4f551b6ed1bcc4336e7c7e25a..73cff83b7062f1a4095572961c9240473bd1bf0d 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -1000,6 +1000,74 @@ def check_timestamps():
             except:
                 reject("%s: deb contents timestamp check failed [%s: %s]" % (filename, sys.exc_type, sys.exc_value))
 
+################################################################################
+################################################################################
+
+# We reject packages if the release team defined a transition for them
+def check_transition(sourcepkg):
+    to_dump = 0
+
+    # Only check if there is a file defined (and existant) 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") and
+    not os.path.exists("%s" % (Cnf["Dinstall::Reject::ReleaseTransitions"])):
+        return
+    
+    # Parse the yaml file
+    sourcefile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'r')
+    try:
+        transitions = load(sourcefile)
+    except error, msg:
+        utils.warn("Not checking transitions, the transitions file is broken: %s." % (msg))
+        return
+
+    # 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 and apt_pkg.VersionCompare(new_vers, ql[0][0]) == 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 sourcepkg 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 description: %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.
+                """
+                       % (sourcepkg, 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 cleanup and to_dump:
+        destfile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'w')
+        dump(transition, destfile)
+
 ################################################################################
 
 def lookup_uid_from_fingerprint(fpr):
@@ -1525,7 +1593,7 @@ def process_it (changes_file):
                 check_timestamps()
                 check_signed_by_key()
                 if changes["architecture"].has_key("source"):
-                    daklib.queue.check_transition(changes["source"])
+                    check_transition(changes["source"])
         Upload.update_subst(reject_message)
         action()
     except SystemExit: