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

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

svn path=/main/trunk/; revision=6865
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 3920fd096..dcc673c79 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1305,15 +1305,18 @@ class dblink(object):
 		"""
 		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: