From 529c735d90b106f8357d5994b6dad57bc3102699 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 10 Oct 2008 01:59:47 +0000 Subject: fix the rest of lockfile bypassing git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4939 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/bcfg2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index b2d203a1a..bd05b3a53 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -316,14 +316,16 @@ class Client: 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: + lockfile = None self.logger.error("Failed to open lockfile") # execute the said configuration self.tools.Execute() if not self.setup['omit-lock-check']: #unlock here - fcntl.lockf(lockfile.fileno(), fcntl.LOCK_UN) - os.remove(LOCKFILE) + if lockfile: + fcntl.lockf(lockfile.fileno(), fcntl.LOCK_UN) + os.remove(LOCKFILE) if not self.setup['file']: # upload statistics -- cgit v1.2.3-1-g7c22