From d622d5478c0cb651b5e561f0485ac9d4d200ef6c Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 27 Mar 2008 04:33:23 +0000
Subject: Make --noreplace take precedence over --newuse, as suggested by
 wolf31o2. (trunk r9512:9514)

svn path=/main/branches/2.1.2/; revision=9515
---
 bin/emerge           |  3 ++-
 pym/portage_locks.py | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/bin/emerge b/bin/emerge
index 3623ea2ea..2140a0275 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1635,6 +1635,7 @@ class depgraph:
 					return 0
 				del e
 
+		noreplace = "--noreplace" in self.myopts
 		reinstall_for_flags = None
 		merging=1
 		if mytype == "installed":
@@ -1648,7 +1649,7 @@ class depgraph:
 			""" If we aren't merging, perform the --newuse check.
 			    If the package has new iuse flags or different use flags then if
 			    --newuse is specified, we need to merge the package. """
-			if merging == 0 and \
+			if not noreplace and merging == 0 and \
 				myroot == self.target_root and \
 				("--newuse" in self.myopts or
 				"--reinstall" in self.myopts) and \
diff --git a/pym/portage_locks.py b/pym/portage_locks.py
index 9b17c60e3..340096a7c 100644
--- a/pym/portage_locks.py
+++ b/pym/portage_locks.py
@@ -79,7 +79,7 @@ def lockfile(mypath, wantnewlockfile=0, unlinkfile=0, waiting_msg=None):
 	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 @@ def lockfile(mypath, wantnewlockfile=0, unlinkfile=0, waiting_msg=None):
 
 		
 	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 @@ def lockfile(mypath, wantnewlockfile=0, unlinkfile=0, waiting_msg=None):
 	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 @@ def unlockfile(mytuple):
 			# 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)
-- 
cgit v1.2.3-1-g7c22