Remove Dinstall::LockFile

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 4e734da46d58cfd7756c22d11f4418a9e808a437..84186c57186a792a7a3e66bd59fd3d864474f05f 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -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:

diff --git a/dak/update_db.py b/dak/update_db.py
index cd34e63ef83fd7641c359d3e70ac8290fddda1f8..2e1c0caa4d633414974d062378975a208f5732b4 100755 (executable)
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -198,7 +198,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
             self.usage(exit_code=1)
 
         try:
-            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)
             fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
         except IOError, e:
             if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EAGAIN':