X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fextensions.py;h=83ae307626ebc65fa34b78ab107046b0273d557b;hb=87bf163d12ec8328d87e1b2a2ca2239221a73bd6;hp=1e7ea43321dca1816a4a20fc8f6d009ec69e2c15;hpb=16f731a893f0ba036a995c25b8b5f3490394070e;p=dak.git

diff --git a/config/debian/extensions.py b/config/debian/extensions.py
index 1e7ea433..83ae3076 100644
--- 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
@@ -30,8 +30,8 @@ def check_transition():
     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.
@@ -86,7 +86,7 @@ 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")