From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 9 Jun 2011 10:39:37 +0000 (-0700)
Subject: locks: use a private constant for fcntl.lockf
X-Git-Tag: v2.2.0_alpha39~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65f3a4d8af054756b9b553c341118334b4526075;p=portage.git

locks: use a private constant for fcntl.lockf
---

diff --git a/pym/portage/locks.py b/pym/portage/locks.py
index 1f8f58013..50a920061 100644
--- a/pym/portage/locks.py
+++ b/pym/portage/locks.py
@@ -25,6 +25,7 @@ if sys.hexversion >= 0x3000000:
 	basestring = str
 
 HARDLINK_FD = -2
+_default_lock_fn = fcntl.lockf
 
 # Used by emerge in order to disable the "waiting for lock" message
 # so that it doesn't interfere with the status display.
@@ -109,9 +110,9 @@ def lockfile(mypath, wantnewlockfile=0, unlinkfile=0,
 
 	# try for a non-blocking lock, if it's held, throw a message
 	# we're waiting on lockfile and use a blocking attempt.
-	locking_method = fcntl.lockf
+	locking_method = _default_lock_fn
 	try:
-		fcntl.lockf(myfd,fcntl.LOCK_EX|fcntl.LOCK_NB)
+		locking_method(myfd, fcntl.LOCK_EX|fcntl.LOCK_NB)
 	except IOError as e:
 		if "errno" not in dir(e):
 			raise
@@ -135,7 +136,7 @@ def lockfile(mypath, wantnewlockfile=0, unlinkfile=0,
 				out.ebegin(waiting_msg)
 			# try for the exclusive lock now.
 			try:
-				fcntl.lockf(myfd, fcntl.LOCK_EX)
+				locking_method(myfd, fcntl.LOCK_EX)
 			except EnvironmentError as e:
 				if out is not None:
 					out.eend(1, str(e))