NEW

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

diff --git a/config/debian/extensions.py b/config/debian/extensions.py
index 51c9f82a3f9a4ef4076b4f432f87c39bef846139..83ae307626ebc65fa34b78ab107046b0273d557b 100644 (file)
--- a/config/debian/extensions.py
+++ b/config/debian/extensions.py
@@ -2,7 +2,7 @@ import sys, os, textwrap
 
 import apt_pkg
 import daklib.utils, daklib.database
-import syck
+import yaml
 
 import daklib.extensions
 from daklib.extensions import replace_dak_function
@@ -20,18 +20,18 @@ def check_transition():
     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()
     try:
-        transitions = syck.load(sourcecontent)
-    except syck.error, msg:
+        transitions = yaml.load(sourcecontent)
+    except yaml.YAMLError, 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.
@@ -72,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")
@@ -85,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()