summaryrefslogtreecommitdiff
path: root/lib/thandy/lockfile
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@torproject.org>2011-07-26 12:47:45 -0300
committerTomás Touceda <chiiph@torproject.org>2011-07-26 12:47:45 -0300
commitc288511871e2f90016ae7782d55451cbcffe5d5e (patch)
tree8ce05196d39a40787a1ca660f9a5b2d9a09d869a /lib/thandy/lockfile
parent93cc09c9d8f44f4f9e27e74cf9937d4db001b9c7 (diff)
Update lockfile to work on OSX
This changes the file modes, it seems OSX needs it this way.
Diffstat (limited to 'lib/thandy/lockfile')
-rwxr-xr-x[-rw-r--r--]lib/thandy/lockfile/__init__.py2
-rwxr-xr-x[-rw-r--r--]lib/thandy/lockfile/linklockfile.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/lockfile/mkdirlockfile.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/lockfile/pidlockfile.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/lockfile/sqlitelockfile.py0
5 files changed, 2 insertions, 0 deletions
diff --git a/lib/thandy/lockfile/__init__.py b/lib/thandy/lockfile/__init__.py
index a167cd8..6ed31d5 100644..100755
--- a/lib/thandy/lockfile/__init__.py
+++ b/lib/thandy/lockfile/__init__.py
@@ -168,6 +168,8 @@ class LockBase:
# Thread objects in Python 2.4 and earlier do not have ident
# attrs. Worm around that.
ident = getattr(t, "ident", hash(t))
+ if ident is None:
+ ident = hash(t)
self.tname = "-%x" % (ident & 0xffffffff)
else:
self.tname = ""
diff --git a/lib/thandy/lockfile/linklockfile.py b/lib/thandy/lockfile/linklockfile.py
index 737fd08..737fd08 100644..100755
--- a/lib/thandy/lockfile/linklockfile.py
+++ b/lib/thandy/lockfile/linklockfile.py
diff --git a/lib/thandy/lockfile/mkdirlockfile.py b/lib/thandy/lockfile/mkdirlockfile.py
index fb78902..fb78902 100644..100755
--- a/lib/thandy/lockfile/mkdirlockfile.py
+++ b/lib/thandy/lockfile/mkdirlockfile.py
diff --git a/lib/thandy/lockfile/pidlockfile.py b/lib/thandy/lockfile/pidlockfile.py
index 10dcb31..10dcb31 100644..100755
--- a/lib/thandy/lockfile/pidlockfile.py
+++ b/lib/thandy/lockfile/pidlockfile.py
diff --git a/lib/thandy/lockfile/sqlitelockfile.py b/lib/thandy/lockfile/sqlitelockfile.py
index d044d2a..d044d2a 100644..100755
--- a/lib/thandy/lockfile/sqlitelockfile.py
+++ b/lib/thandy/lockfile/sqlitelockfile.py