[dak/master 1/3] 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>
---
config/debian/dak.conf | 6 +++++-
dak/transitions.py | 12 ++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index ceafaed..d7006c8 100644
--- 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 4c4ac78..2bd3238 100755
--- 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"]:
--
1.6.3.3
Reply to: