Adjust urgencypath and TESTINGINPUT path

diff --git a/ChangeLog b/ChangeLog
index 1ffd288627aa1c812501a35ed932b5fd5267ff32..0eebb7c386fc32973ea52f98e0cae38f6fe12c7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-04-27  Joerg Jaspert  <joerg@debian.org>
 
+       * dak/process_accepted.py (Urgency_Log.__init__): Warn if the
+       configured path does not exist or is not writeable by us. Use a
+       tmp path if so, so we do not lose the urgencies in such cases.
+
        * config/debian/dak.conf: Changed path for UrgencyLog
        Same for the ReleaseTransitions file
 

diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index 86396832e741e864fb8355ce976d06927235efd6..e31ebbf7af2ff301b1201ba278c2d584b37e2c4e 100755 (executable)
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -71,9 +71,9 @@ class Urgency_Log:
         self.timestamp = time.strftime("%Y%m%d%H%M%S")
         # Create the log directory if it doesn't exist
         self.log_dir = Cnf["Dir::UrgencyLog"]
-        if not os.path.exists(self.log_dir):
-            umask = os.umask(00000)
-            os.makedirs(self.log_dir, 02775)
+        if not os.path.exists(self.log_dir) or not os.access(self.log_dir, W_OK):
+            daklib.utils.warn("UrgencyLog directory %s does not exist or is not writeable, using /srv/ftp.debian.org/tmp/ instead" % (self.log_dir))
+            self.log_dir = '/srv/ftp.debian.org/tmp/'
         # Open the logfile
         self.log_filename = "%s/.install-urgencies-%s.new" % (self.log_dir, self.timestamp)
         self.log_file = daklib.utils.open_file(self.log_filename, 'w')

diff --git a/scripts/debian/import_testing.sh b/scripts/debian/import_testing.sh
index 31ca4ba667efc456d24cda6aef1b4ea5a559bdf2..6b5fa6c00a837867ec4011f445ccd88a62f50c44 100755 (executable)
--- a/scripts/debian/import_testing.sh
+++ b/scripts/debian/import_testing.sh
@@ -29,7 +29,7 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 # What file we look at.
-TESTINGINPUT="/srv/ftp.debian.org/testing/data/testing/HeidiReal"
+TESTINGINPUT="/srv/release.debian.org/britney/Heidi/set/current"
 
 # Change to a known safe location
 cd $masterdir