X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fextensions.py;h=0bb51bd7e8d6281f776a578efb0a95c1fd3b4796;hb=290343bd9e607cb870f315d68a19796c5e9989c0;hp=31728d2a1a834eb55785dd703403dbc3b0ed9465;hpb=d9c01c5b1725a6e5a684647600dc915017fe50c9;p=dak.git

diff --git a/config/debian/extensions.py b/config/debian/extensions.py
index 31728d2a..0bb51bd7 100644
--- 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()
@@ -70,7 +72,8 @@ 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.
 Please mail debian-release@lists.debian.org or contact %s directly if you
-need further assistance."""
+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")
@@ -83,14 +86,14 @@ def check_signed_by_key(oldfn):
 
     if changes["source"] == "dpkg":
         fpr = changes["fingerprint"]
-        (uid, uid_name) = dak_module.lookup_uid_from_fingerprint(fpr)
+        (uid, uid_name, is_dm) = dak_module.lookup_uid_from_fingerprint(fpr)
         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()