From dc00509189b395b449c4b749767f63bf93a1d2df Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 22 Aug 2008 23:30:13 +0000 Subject: Fix isprotected() call in dblink._collision_protect() to properly account for $ROOT. svn path=/main/trunk/; revision=11452 --- pym/portage/dbapi/vartree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3-1-g7c22