[gentoo-commits] proj/portage:master commit in: pym/portage/

["Zac Medico" <zmedico@gentoo.org>]

commit:     af013a2de5a2dc7069de5e95c7474556cf9208ab
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 17:52:23 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 17:52:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=af013a2d

locks.py: use flock with PyPy for issue 747

---
 pym/portage/locks.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/pym/portage/locks.py b/pym/portage/locks.py
index 9ed1d6a..9cfb87e 100644
--- a/pym/portage/locks.py
+++ b/pym/portage/locks.py
@@ -8,6 +8,7 @@ __all__ = ["lockdir", "unlockdir", "lockfile", "unlockfile", \
 
 import errno
 import fcntl
+import platform
 import stat
 import sys
 import time
@@ -27,6 +28,10 @@ if sys.hexversion >= 0x3000000:
 HARDLINK_FD = -2
 _default_lock_fn = fcntl.lockf
 
+if platform.python_implementation() == 'PyPy':
+	# workaround for https://bugs.pypy.org/issue747
+	_default_lock_fn = fcntl.flock
+
 # Used by emerge in order to disable the "waiting for lock" message
 # so that it doesn't interfere with the status display.
 _quiet = False