summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsrc/sbin/bcfg216
1 files changed, 9 insertions, 7 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 7e78935ba..b2d203a1a 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -307,14 +307,16 @@ class Client:
if not self.setup['omit-lock-check']:
#check lock here
- lockfile = open(LOCKFILE, 'w')
try:
- fcntl.lockf(lockfile.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
- except IOError:
- #otherwise exit and give a warning to the user
- self.fatal_error("An other instance of bcfg2 is running. If you what to bypass the check, run with %s option" %
- (Bcfg2.Options.OMIT_LOCK_CHECK.cmd))
- return(1)
+ lockfile = open(LOCKFILE, 'w')
+ try:
+ fcntl.lockf(lockfile.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
+ except IOError:
+ #otherwise exit and give a warning to the user
+ self.fatal_error("An other instance of bcfg2 is running. If you what to bypass the check, run with %s option" %
+ (Bcfg2.Options.OMIT_LOCK_CHECK.cmd))
+ except:
+ self.logger.error("Failed to open lockfile")
# execute the said configuration
self.tools.Execute()