summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-08-22 23:30:13 +0000
committerZac Medico <zmedico@gentoo.org>2008-08-22 23:30:13 +0000
commitdc00509189b395b449c4b749767f63bf93a1d2df (patch)
tree1713730ab48a14db00cc941695b2e133b982522f
parent94acaa08984c5506fa8cb804ddf9284bc53f11ad (diff)
downloadportage-dc00509189b395b449c4b749767f63bf93a1d2df.tar.gz
portage-dc00509189b395b449c4b749767f63bf93a1d2df.tar.bz2
portage-dc00509189b395b449c4b749767f63bf93a1d2df.zip
Fix isprotected() call in dblink._collision_protect() to properly account
for $ROOT. svn path=/main/trunk/; revision=11452
-rw-r--r--pym/portage/dbapi/vartree.py3
1 files changed, 2 insertions, 1 deletions
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: