Also replace dump

diff --git a/ChangeLog b/ChangeLog
index 3b0d04f5acc96bba3f21acac57fbd012a07c3837..e3e784abcaab630c5c4070f55c54a2fe2ea3d33e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * dak/transitions.py: use yaml.dump instead of syck.dump, as syck
        seems to have a bug in its dump(), causing it to write illegal entries
+       And also do this for load.
 
 2008-05-10  Stephen Gran   <sgran@debian.org>
        * tools/debianqueued-0.9/debianqueued: First pass at a send_mail

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