From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] [PATCH 1/6] FIXME! Comment out a small code block causing TypeError.
Date: Wed, 10 Sep 2014 21:01:03 -0700 [thread overview]
Message-ID: <1410408068-3441-2-git-send-email-dolsen@gentoo.org> (raw)
In-Reply-To: <1410408068-3441-1-git-send-email-dolsen@gentoo.org>
This was also short circuiting another large code block. FIXME!!!! This
whole class seems overly complicated with TOO MANY nested try:excepts:
---
catalyst/lock.py | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/catalyst/lock.py b/catalyst/lock.py
index 78968cb..c90f5b8 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -27,11 +27,17 @@ class LockDir:
locking_method=fcntl.flock
lock_dirs_in_use=[]
die_on_failed_lock=True
+
def __del__(self):
+ #print "Lock.__del__() 1"
self.clean_my_hardlocks()
+ #print "Lock.__del__() 2"
self.delete_lock_from_path_list()
+ #print "Lock.__del__() 3"
if self.islocked():
+ #print "Lock.__del__() 4"
self.fcntl_unlock()
+ #print "Lock.__del__() finnished"
def __init__(self,lockdir):
self.locked=False
@@ -179,7 +185,9 @@ class LockDir:
unlinkfile = 1
if not os.path.exists(self.lockfile):
print "lockfile does not exist '%s'" % self.lockfile
+ #print "fcntl_unlock() , self.myfd:", self.myfd, type(self.myfd)
if (self.myfd != None):
+ #print "fcntl_unlock() trying to close it "
try:
os.close(self.myfd)
self.myfd=None
@@ -193,11 +201,13 @@ class LockDir:
unlinkfile = 1
self.locking_method(self.myfd,fcntl.LOCK_UN)
except SystemExit, e:
- raise
+ raise e
except Exception, e:
- os.close(self.myfd)
- self.myfd=None
- raise IOError, "Failed to unlock file '%s'\n" % self.lockfile
+ #if self.myfd is not None:
+ #print "fcntl_unlock() trying to close", self.myfd
+ #os.close(self.myfd)
+ #self.myfd=None
+ #raise IOError, "Failed to unlock file '%s'\n%s" % (self.lockfile, str(e))
try:
# This sleep call was added to allow other processes that are
# waiting for a lock to be able to grab it before it is deleted.
@@ -224,7 +234,7 @@ class LockDir:
# if "DEBUG" in self.settings:
# print "Unlinked lockfile..."
except SystemExit, e:
- raise
+ raise e
except Exception, e:
# We really don't care... Someone else has the lock.
# So it is their problem now.
@@ -236,7 +246,7 @@ class LockDir:
# open fd closed automatically on them.
#if type(lockfilename) == types.StringType:
# os.close(myfd)
-
+ #print "fcntl_unlock() trying a last ditch close", self.myfd
if (self.myfd != None):
os.close(self.myfd)
self.myfd=None
@@ -421,6 +431,7 @@ class LockDir:
pass
return results
+
if __name__ == "__main__":
def lock_work():
--
2.1.0
next prev parent reply other threads:[~2014-09-11 4:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-11 4:01 [gentoo-catalyst] [PATCH 0/6] Various changes towards 3.0 branch Brian Dolbec
2014-09-11 4:01 ` Brian Dolbec [this message]
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 2/6] Break out more repeated (path1 + path2)'s Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 3/6] Rename a make.conf key to make_conf due to bash variable name restrictions Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 4/6] reduce 2 operations into one simpler one Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 5/6] Extend ParserBase to do variable substitution Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 6/6] Make shdir a complete path to ease it's use Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410408068-3441-2-git-send-email-dolsen@gentoo.org \
--to=dolsen@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox