X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Ftransitions.py;h=157e1c0a0febbcf6074f03ad49115c88ac583373;hb=5d965c34b35048f8a8fab0a7a11f2943d833952d;hp=acae2072a10e6078f520a43c886d8bb5e2ef7448;hpb=51299d98958e1d413bebe8314f27a533db60d308;p=dak.git

diff --git a/dak/transitions.py b/dak/transitions.py
index acae2072..157e1c0a 100755
--- 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 *
@@ -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"]:
@@ -319,7 +318,7 @@ 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"])
+    (fd, path) = tempfile.mkstemp("", "transitions", Cnf["Dir::TempPath"])
     os.chmod(path, 0644)
     f = open(path, "w")
     yaml.dump(transitions, f, default_flow_style=False)
@@ -578,13 +577,13 @@ def main():
                           (Cnf["Dinstall::Reject::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"]: