[patch] also handle ENOENT from fstat calls

lock-cifs.patch (text/plain), 1.66 KB, created by Zac Medico on 2008-03-17 02:33:41 UTC

Index: pym/portage_locks.py
===================================================================
--- pym/portage_locks.py	(revision 9417)
+++ pym/portage_locks.py	(working copy)
@@ -79,7 +79,7 @@
 	except IOError, e:
 		if "errno" not in dir(e):
 			raise
-		if e.errno == errno.EAGAIN:
+		if e.errno in (errno.EACCES, errno.EAGAIN):
 			# resource temp unavailable; eg, someone beat us to the lock.
 			if waiting_msg is None:
 				if isinstance(mypath, int):
@@ -111,7 +111,7 @@
 
 		
 	if type(lockfilename) == types.StringType and \
-		myfd != HARDLINK_FD and os.fstat(myfd).st_nlink == 0:
+		myfd != HARDLINK_FD and _fstat_nlink(myfd) == 0:
 		# The file was deleted on us... Keep trying to make one...
 		os.close(myfd)
 		portage_util.writemsg("lockfile recurse\n",1)
@@ -122,6 +122,22 @@
 	portage_util.writemsg(str((lockfilename,myfd,unlinkfile))+"\n",1)
 	return (lockfilename,myfd,unlinkfile,locking_method)
 
+def _fstat_nlink(fd):
+	"""
+	@param fd: an open file descriptor
+	@type fd: Integer
+	@rtype: Integer
+	@return: the current number of hardlinks to the file
+	"""
+	try:
+		return os.fstat(fd).st_nlink
+	except EnvironmentError, e:
+		if e.errno == errno.ENOENT:
+			# Some filesystems such as CIFS return
+			# ENOENT which means st_nlink == 0.
+			return 0
+		raise
+
 def unlockfile(mytuple):
 	import fcntl
 
@@ -167,7 +183,7 @@
 			# We won the lock, so there isn't competition for it.
 			# We can safely delete the file.
 			portage_util.writemsg("Got the lockfile...\n",1)
-			if os.fstat(myfd).st_nlink == 1:
+			if _fstat_nlink(myfd) == 1:
 				os.unlink(lockfilename)
 				portage_util.writemsg("Unlinked lockfile...\n",1)
 				locking_method(myfd,fcntl.LOCK_UN)