config/debian/dak.conf, dak/transitions.py:

Move TempPath under its own domain, so it can be used by some other
pieces of dak. Adjust transitions accordingly.

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index ceafaeda9e9a783ba73133e722685a0b4498535e..d7006c879bf6742c8dc1239eada8af9d2f8413a7 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -49,7 +49,6 @@ Dinstall
 Transitions
 {
    Notifications "debian-devel@lists.debian.org";
-   TempPath "/srv/ftp.debian.org/tmp/";
 };
 
 Generate-Index-Diffs
@@ -744,3 +743,8 @@ Contents
   Header "contents";
   Root "/srv/ftp.debian.org/test/";
 }
+
+TempPath
+{
+   TempPath "/srv/ftp.debian.org/tmp/";
+};

diff --git a/dak/transitions.py b/dak/transitions.py
index 4c4ac78ee8a0ed5cb4ad44d9deaf3894a66a87fb..2bd32381afc1b010caff11babb2af57c0644bed5 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -287,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["TempPath::TempPath"]):
+        print "Will not accept transitions file outside of %s" % (Cnf["TempPath::TempPath"])
         sys.exit(3)
 
     if Options["sudo"]:
@@ -318,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["TempPath::TempPath"])
     os.chmod(path, 0644)
     f = open(path, "w")
     yaml.dump(transitions, f, default_flow_style=False)
@@ -577,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("TempPath::TempPath", "")
     if temppath == "":
-        utils.warn("Transitions::TempPath not defined")
+        utils.warn("TempPath::TempPath not defined")
         sys.exit(1)
     if not os.path.exists(temppath):
         utils.warn("Temporary path %s not found." %
-                          (Cnf["Transitions::TempPath"]))
+                          (Cnf["TempPath::TempPath"]))
         sys.exit(1)
 
     if Options["import"]: