diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-10-31 18:49:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-10-31 18:49:10 +0000 |
| commit | 27e260bf5ab03d632e944dac64371e4b0df5bd08 (patch) | |
| tree | 07316b5b131b74323f0f9e319faa02b3677450fe | |
| parent | Bug #236609 - Fix columns calculation for TERM="dumb". Thanks to Ulrich Müller (diff) | |
| download | portage-multirepo-27e260bf5ab03d632e944dac64371e4b0df5bd08.tar.gz portage-multirepo-27e260bf5ab03d632e944dac64371e4b0df5bd08.tar.bz2 portage-multirepo-27e260bf5ab03d632e944dac64371e4b0df5bd08.zip | |
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
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index d249a71d..363087bf 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: |