Holding isn't a queue either, it's a tmpdir

[dak.git] / dak / process_upload.py

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 4e734da46d58cfd7756c22d11f4418a9e808a437..bf74baa65be064e356abaa8459b39a6688c85ad9 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -364,7 +364,7 @@ def process_it(changes_file, session):
         # If this is the Real Thing(tm), copy things into a private
         # holding directory first to avoid replacable file races.
         if not Options["No-Action"]:
-            os.chdir(cnf["Dir::Queue::Holding"])
+            holding.chdir_to_holding()
 
             # Absolutize the filename to avoid the requirement of being in the
             # same directory as the .changes file.
@@ -455,7 +455,7 @@ def main():
 
     # Obtain lock if not in no-action mode and initialize the log
     if not Options["No-Action"]:
-        lock_fd = os.open(cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT)
+        lock_fd = os.open(os.path.join(cnf["Dir::Lock"], 'dinstall.lock'), os.O_RDWR | os.O_CREAT)
         try:
             fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
         except IOError, e: