From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 17 Jun 2007 22:43:17 +0000 (-0000)
Subject: In dblink.isowner() don't bother to stat the file when it's contained in the contents... 
X-Git-Tag: v2.1.3~212
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca069e392d099d952a0888218c2ec53c0f31f28d;p=portage.git

In dblink.isowner() don't bother to stat the file when it's contained in the contents. (trunk r6865)

svn path=/main/branches/2.1.2/; revision=6866
---

diff --git a/pym/portage.py b/pym/portage.py
index dc54e8abb..955901a52 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7270,15 +7270,18 @@ class dblink:
 		"""
 		destfile = normalize_path(
 			os.path.join(destroot, filename.lstrip(os.path.sep)))
-		try:
-			mylstat = os.lstat(destfile)
-		except (OSError, IOError):
-			return True
 
 		pkgfiles = self.getcontents()
 		if pkgfiles and destfile in pkgfiles:
 			return True
 		if pkgfiles:
+			try:
+				mylstat = os.lstat(destfile)
+			except EnvironmentError, e:
+				if e.errno != errno.ENOENT:
+					raise
+				del e
+				return True
 			if self._contents_inodes is None:
 				self._contents_inodes = set()
 				for x in pkgfiles: