Merge remote-tracking branch 'dktrkranz/fixes'

[dak.git] / dak / transitions.py

diff --git a/dak/transitions.py b/dak/transitions.py
index acae2072a10e6078f520a43c886d8bb5e2ef7448..68c65b6a070bf9dbe84d3f8a664c95ccd89572d0 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -34,7 +34,6 @@ import time
 import errno
 import fcntl
 import tempfile
-import pwd
 import apt_pkg
 
 from daklib.dbconn import *
@@ -77,9 +76,9 @@ def init():
         if not Cnf.has_key("Edit-Transitions::Options::%s" % (i)):
             Cnf["Edit-Transitions::Options::%s" % (i)] = ""
 
-    apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
+    apt_pkg.parse_commandline(Cnf, Arguments, sys.argv)
 
-    Options = Cnf.SubTree("Edit-Transitions::Options")
+    Options = Cnf.subtree("Edit-Transitions::Options")
 
     if Options["help"]:
         usage()
@@ -135,8 +134,8 @@ def load_transitions(trans_file):
     sourcecontent = sourcefile.read()
     failure = False
     try:
-        trans = yaml.load(sourcecontent)
-    except yaml.YAMLError, exc:
+        trans = yaml.safe_load(sourcecontent)
+    except yaml.YAMLError as exc:
         # Someone fucked it up
         print "ERROR: %s" % (exc)
         return None
@@ -226,7 +225,7 @@ def lock_file(f):
         try:
             fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
             return lock_fd
-        except OSError, e:
+        except OSError as e:
             if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EEXIST':
                 print "Unable to get lock for %s (try %d of 10)" % \
                         (file, retry+1)
@@ -256,14 +255,14 @@ def write_transitions(from_trans):
 
     """
 
-    trans_file = Cnf["Dinstall::Reject::ReleaseTransitions"]
+    trans_file = Cnf["Dinstall::ReleaseTransitions"]
     trans_temp = trans_file + ".tmp"
 
     trans_lock = lock_file(trans_file)
     temp_lock  = lock_file(trans_temp)
 
     destfile = file(trans_temp, 'w')
-    yaml.dump(from_trans, destfile, default_flow_style=False)
+    yaml.safe_dump(from_trans, destfile, default_flow_style=False)
     destfile.close()
 
     os.rename(trans_temp, trans_file)
@@ -288,8 +287,8 @@ def write_transitions_from_file(from_file):
     """
 
     # Lets check if from_file is in the directory we expect it to be in
-    if not os.path.abspath(from_file).startswith(Cnf["Transitions::TempPath"]):
-        print "Will not accept transitions file outside of %s" % (Cnf["Transitions::TempPath"])
+    if not os.path.abspath(from_file).startswith(Cnf["Dir::TempPath"]):
+        print "Will not accept transitions file outside of %s" % (Cnf["Dir::TempPath"])
         sys.exit(3)
 
     if Options["sudo"]:
@@ -298,7 +297,7 @@ def write_transitions_from_file(from_file):
     else:
         trans = load_transitions(from_file)
         if trans is None:
-            raise TransitionsError, "Unparsable transitions file %s" % (file)
+            raise TransitionsError("Unparsable transitions file %s" % (file))
         write_transitions(trans)
 
 ################################################################################
@@ -319,17 +318,17 @@ def temp_transitions_file(transitions):
            sudo-ed script and would be unreadable if it has default mkstemp mode
     """
 
-    (fd, path) = tempfile.mkstemp("", "transitions", Cnf["Transitions::TempPath"])
-    os.chmod(path, 0644)
+    (fd, path) = tempfile.mkstemp("", "transitions", Cnf["Dir::TempPath"])
+    os.chmod(path, 0o644)
     f = open(path, "w")
-    yaml.dump(transitions, f, default_flow_style=False)
+    yaml.safe_dump(transitions, f, default_flow_style=False)
     return path
 
 ################################################################################
 
 def edit_transitions():
     """ Edit the defined transitions. """
-    trans_file = Cnf["Dinstall::Reject::ReleaseTransitions"]
+    trans_file = Cnf["Dinstall::ReleaseTransitions"]
     edit_file = temp_transitions_file(load_transitions(trans_file))
 
     editor = os.environ.get("EDITOR", "vi")
@@ -416,7 +415,7 @@ def check_transitions(transitions):
             print "Transition source %s not in testing, transition still ongoing." % (source)
         else:
             current = sourceobj.version
-            compare = apt_pkg.VersionCompare(current, expected)
+            compare = apt_pkg.version_compare(current, expected)
             if compare < 0:
                 # This is still valid, the current version in database is older than
                 # the new version we wait for
@@ -541,7 +540,7 @@ def transition_info(transitions):
             # No package in testing
             print "Transition source %s not in testing, transition still ongoing." % (source)
         else:
-            compare = apt_pkg.VersionCompare(sourceobj.version, expected)
+            compare = apt_pkg.version_compare(sourceobj.version, expected)
             print "Apt compare says: %s" % (compare)
             if compare < 0:
                 # This is still valid, the current version in database is older than
@@ -569,28 +568,28 @@ def main():
     init()
 
     # Check if there is a file defined (and existant)
-    transpath = Cnf.get("Dinstall::Reject::ReleaseTransitions", "")
+    transpath = Cnf.get("Dinstall::ReleaseTransitions", "")
     if transpath == "":
-        utils.warn("Dinstall::Reject::ReleaseTransitions not defined")
+        utils.warn("Dinstall::ReleaseTransitions not defined")
         sys.exit(1)
     if not os.path.exists(transpath):
         utils.warn("ReleaseTransitions file, %s, not found." %
-                          (Cnf["Dinstall::Reject::ReleaseTransitions"]))
+                          (Cnf["Dinstall::ReleaseTransitions"]))
         sys.exit(1)
     # Also check if our temp directory is defined and existant
-    temppath = Cnf.get("Transitions::TempPath", "")
+    temppath = Cnf.get("Dir::TempPath", "")
     if temppath == "":
-        utils.warn("Transitions::TempPath not defined")
+        utils.warn("Dir::TempPath not defined")
         sys.exit(1)
     if not os.path.exists(temppath):
         utils.warn("Temporary path %s not found." %
-                          (Cnf["Transitions::TempPath"]))
+                          (Cnf["Dir::TempPath"]))
         sys.exit(1)
 
     if Options["import"]:
         try:
             write_transitions_from_file(Options["import"])
-        except TransitionsError, m:
+        except TransitionsError as m:
             print m
             sys.exit(2)
         sys.exit(0)