[dak/master 1/3] Improve lock fallbacks
If Process-New doesn't have specific lock configuration,
fall back to some saneish defaults.
Signed-off-by: Mark Hymers <mhy@debian.org>
---
dak/process_new.py | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dak/process_new.py b/dak/process_new.py
index 0ab6a2d..1a25369 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -611,13 +611,16 @@ def check_daily_lock():
cnf = Config()
try:
- os.open(cnf["Process-New::DinstallLockFile"],
+ lockfile = cnf.get("Process-New::DinstallLockFile",
+ os.path.join(cnf['Dir::Lock'], 'processnew.lock'))
+
+ os.open(lockfile,
os.O_RDONLY | os.O_CREAT | os.O_EXCL)
except OSError, e:
if e.errno == errno.EEXIST or e.errno == errno.EACCES:
raise CantGetLockError
- os.unlink(cnf["Process-New::DinstallLockFile"])
+ os.unlink(lockfile)
@contextlib.contextmanager
@@ -629,7 +632,10 @@ def lock_package(package):
@param package: source package name to lock
"""
- path = os.path.join(Config()["Process-New::LockDir"], package)
+ cnf = Config()
+
+ path = os.path.join(cnf.get("Process-New::LockDir", cnf['Dir::Lock']), package)
+
try:
fd = os.open(path, os.O_CREAT | os.O_EXCL | os.O_RDONLY)
except OSError, e:
--
1.7.2.5
Reply to: