From 313e4a48284054ee69ed1a6bac13426fdb0042ae Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Mon, 21 Jan 2013 15:54:02 -0800 Subject: [PATCH] Use normpath from support --- catalyst/lock.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/catalyst/lock.py b/catalyst/lock.py index b963af23..764c11e6 100644 --- a/catalyst/lock.py +++ b/catalyst/lock.py @@ -1,10 +1,15 @@ #!/usr/bin/python + + import os import fcntl import errno import sys import time -from catalyst.support import CatalystError + + +from catalyst.support import CatalystError, normpath + def writemsg(mystr): sys.stderr.write(mystr) @@ -80,7 +85,7 @@ class LockDir: if not self.islocked(): if lockdir[-1] == "/": lockdir=lockdir[:-1] - self.lockdir=normpath(lockdir) + self.lockdir = normpath(lockdir) # if "DEBUG" in self.settings: # print "setting lockdir to", self.lockdir else: @@ -94,7 +99,7 @@ class LockDir: def set_lockfile(self): if not self.islocked(): - self.lockfile=normpath(self.lockdir+'/'+self.lockfilename) + self.lockfile = normpath(self.lockdir+'/'+self.lockfilename) # if "DEBUG" in self.settings: # print "setting lockfile to", self.lockfile @@ -430,12 +435,12 @@ if __name__ == "__main__": print i,time.time() time.sleep(1) print - def normpath(mypath): - newpath = os.path.normpath(mypath) - if len(newpath) > 1: - if newpath[1] == "/": - newpath = "/"+newpath.lstrip("/") - return newpath + #def normpath(mypath): + #newpath = os.path.normpath(mypath) + #if len(newpath) > 1: + #if newpath[1] == "/": + #newpath = "/"+newpath.lstrip("/") + #return newpath print "Lock 5 starting" Lock1=LockDir("/tmp/lock_path") @@ -474,9 +479,3 @@ if __name__ == "__main__": Lock1.unlock() print "Lock1 unlock" -#Lock1.write_lock() -#time.sleep(2) -#Lock1.unlock() - ##Lock1.write_lock() - #time.sleep(2) - #Lock1.unlock() -- 2.26.2