From 27e260bf5ab03d632e944dac64371e4b0df5bd08 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 31 Oct 2008 18:49:10 +0000 Subject: 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 --- pym/portage/dbapi/vartree.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pym') 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: -- cgit v1.2.3-1-g7c22