import os, pg, sys, time, errno, fcntl, tempfile, pwd, re
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
-import syck
+from daklib import database
+from daklib import utils
+from daklib.dak_exceptions import TransitionsError
+import yaml
# Globals
Cnf = None
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
temp_lock = lock_file(trans_temp)
destfile = file(trans_temp, 'w')
- syck.dump(from_trans, destfile)
+ yaml.dump(from_trans, destfile, default_flow_style=False)
destfile.close()
os.rename(trans_temp, trans_file)
################################################################################
-class ParseException(Exception):
- pass
-
##########################################
#### This usually runs within sudo !! ####
##########################################
else:
trans = load_transitions(from_file)
if trans is None:
- raise ParseException, "Unparsable transitions file %s" % (file)
+ raise TransitionsError, "Unparsable transitions file %s" % (file)
write_transitions(trans)
################################################################################
(fd, path) = tempfile.mkstemp("", "transitions", Cnf["Transitions::TempPath"])
os.chmod(path, 0644)
f = open(path, "w")
- syck.dump(transitions, f)
+ yaml.dump(transitions, f, default_flow_style=False)
return path
################################################################################
if Options["import"]:
try:
write_transitions_from_file(Options["import"])
- except ParseException, m:
+ except TransitionsError, m:
print m
sys.exit(2)
sys.exit(0)