From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 22 Aug 2008 23:30:13 +0000 (-0000)
Subject: Fix isprotected() call in dblink._collision_protect() to properly account
X-Git-Tag: v2.2_rc9~62
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc00509189b395b449c4b749767f63bf93a1d2df;p=portage.git

Fix isprotected() call in dblink._collision_protect() to properly account
for $ROOT.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index b8b37236c..3671190d2 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2592,8 +2592,9 @@ class dblink(object):
 				if f[0] != "/":
 					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(f)):
+					if (ver.isowner(f, destroot) or ver.isprotected(full_path)):
 						isowned = True
 						break
 				if not isowned: