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 d249a71d754eaeb38647c546530f4d5b7d6cc76b..363087bfaa429ac286b985f25f14a892dc3888ed 100644 (file)
--- 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: