Merge commit 'godog/master' into merge

[dak.git] / dak / transitions.py

diff --git a/dak/transitions.py b/dak/transitions.py
index e4b6d582fbd8f40f5ea3b048210c46963feabc1d..b7e50651e8d4daf7b8d284f89bf4a9e5c0fe10cf 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -28,7 +28,6 @@ import apt_pkg
 from daklib import database
 from daklib import utils
 from daklib.dak_exceptions import TransitionsError
-import syck
 import yaml
 
 # Globals
@@ -106,10 +105,10 @@ def load_transitions(trans_file):
     sourcecontent = sourcefile.read()
     failure = False
     try:
-        trans = syck.load(sourcecontent)
-    except syck.error, msg:
+        trans = yaml.load(sourcecontent)
+    except yaml.YAMLError, exc:
         # Someone fucked it up
-        print "ERROR: %s" % (msg)
+        print "ERROR: %s" % (exc)
         return None
 
     # lets do further validation here