From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 31 Oct 2008 18:49:10 +0000 (-0000)
Subject: In dblink._collision_protect(), remove redundant self.isowner() calls since
X-Git-Tag: v2.2_rc13~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=27e260bf5ab03d632e944dac64371e4b0df5bd08;p=portage.git

In dblink._collision_protect(), remove redundant self.isowner() calls since
self hasn't yet been merged and therefore has no CONTENTS file for ownership
checks. Also, remove redundant isprotected() calls.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index d249a71d7..363087bfa 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2734,10 +2734,12 @@ class dblink(object):
 					f="/"+f
 				isowned = False
 				full_path = os.path.join(destroot, f.lstrip(os.path.sep))
-				for ver in [self] + mypkglist:
-					if (ver.isowner(f, destroot) or ver.isprotected(full_path)):
+				for ver in mypkglist:
+					if ver.isowner(f, destroot):
 						isowned = True
 						break
+				if not isowned and self.isprotected(full_path):
+					isowned = True
 				if not isowned:
 					stopmerge = True
 					if collision_ignore: