do not whine if locked by the same process before...
BUG:FIXED:10568
This commit is contained in:
+4
-1
@@ -62,8 +62,10 @@ def locked(func):
|
||||
|
||||
try:
|
||||
fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||
ctx.locked = True
|
||||
except IOError:
|
||||
raise pisi.errors.AnotherInstanceError(_("Another instance of PiSi is running. Only one instance is allowed."))
|
||||
if not ctx.locked:
|
||||
raise pisi.errors.AnotherInstanceError(_("Another instance of PiSi is running. Only one instance is allowed."))
|
||||
|
||||
try:
|
||||
pisi.db.invalidate_caches()
|
||||
@@ -71,6 +73,7 @@ def locked(func):
|
||||
pisi.db.update_caches()
|
||||
return ret
|
||||
finally:
|
||||
ctx.locked = False
|
||||
lock.close()
|
||||
return wrapper
|
||||
|
||||
|
||||
@@ -25,6 +25,8 @@ config = None
|
||||
|
||||
log = None
|
||||
|
||||
locked = False
|
||||
|
||||
def set_option(opt, val):
|
||||
config.set_option(opt, val)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user