Merge commit 'pkern/master'

[dak.git] / config / debian / extensions.py

diff --git a/config/debian/extensions.py b/config/debian/extensions.py
index 9823b29c5fd1f563adffb89f4207194429f9d4fe..1e7ea43321dca1816a4a20fc8f6d009ec69e2c15 100644 (file)
--- a/config/debian/extensions.py
+++ b/config/debian/extensions.py
@@ -15,15 +15,17 @@ def check_transition():
     sourcepkg = changes["source"]
 
     # No sourceful upload -> no need to do anything else, direct return
-    if "source" not in changes["architecture"]:
+    # We also work with unstable uploads, not experimental or those going to some
+    # proposed-updates queue
+    if "source" not in changes["architecture"] or "unstable" not in changes["distribution"]:
         return
 
-    # Also only check if there is a file defined (and existant) with 
+    # Also only check if there is a file defined (and existant) with
     # checks.
     transpath = Cnf.get("Dinstall::Reject::ReleaseTransitions", "")
     if transpath == "" or not os.path.exists(transpath):
         return
-    
+
     # Parse the yaml file
     sourcefile = file(transpath, 'r')
     sourcecontent = sourcefile.read()
@@ -32,7 +34,7 @@ def check_transition():
     except syck.error, msg:
         # This shouldn't happen, there is a wrapper to edit the file which
         # checks it, but we prefer to be safe than ending up rejecting
-       # everything.
+        # everything.
         daklib.utils.warn("Not checking transitions, the transitions file is broken: %s." % (msg))
         return
 
@@ -55,22 +57,24 @@ def check_transition():
             if sourcepkg in t['packages']:
                 # The source is affected, lets reject it.
 
-               rejectmsg = "%s: part of the %s transition.\n\n" % (
-                       sourcepkg, trans)
-               rejectmsg += "Transition description: %s\n\n" % (t["reason"])
+                rejectmsg = "%s: part of the %s transition.\n\n" % (
+                    sourcepkg, trans)
+
+                if current is not None:
+                    currentlymsg = "at version %s" % (current)
+                else:
+                    currentlymsg = "not present in testing"
 
-               if current is not None:
-                   currentlymsg = "at version %s" % (current)
-               else:
-                   currentlymsg = "not present in testing"
+                rejectmsg += "Transition description: %s\n\n" % (t["reason"])
 
-               rejectmsg += "\n".join(textwrap.wrap("""Your package
+                rejectmsg += "\n".join(textwrap.wrap("""Your package
 is part of a testing transition designed to get %s migrated (it is
 currently %s, we need version %s).  This transition is managed by the
-release team, and %s is the release team member responsible for it.
+Release Team, and %s is the Release-Team member responsible for it.
 Please mail debian-release@lists.debian.org or contact %s directly if you
-need further assistance."""
-                       % (source, currentlymsg, expected,t["rm"], t["rm"])))
+need further assistance.  You might want to upload to experimental until this
+transition is done."""
+                        % (source, currentlymsg, expected,t["rm"], t["rm"])))
 
                 reject(rejectmsg + "\n")
                 return
@@ -86,10 +90,10 @@ def check_signed_by_key(oldfn):
         if fpr == "5906F687BD03ACAD0D8E602EFCF37657" or uid == "iwj":
             reject("Upload blocked due to hijack attempt 2008/03/19")
 
-           # NB: 1.15.0, 1.15.2 signed by this key targetted at unstable
-           #     have been made available in the wild, and should remain
-           #     blocked until Debian's dpkg has revved past those version
-           #     numbers
+            # NB: 1.15.0, 1.15.2 signed by this key targetted at unstable
+            #     have been made available in the wild, and should remain
+            #     blocked until Debian's dpkg has revved past those version
+            #     numbers
 
     oldfn()