* [gentoo-commits] portage r11765 - main/trunk/pym/portage/dbapi
@ 2008-10-31 18:49 99% Zac Medico (zmedico)
0 siblings, 0 replies; 1+ results
From: Zac Medico (zmedico) @ 2008-10-31 18:49 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-10-31 18:49:10 +0000 (Fri, 31 Oct 2008)
New Revision: 11765
Modified:
main/trunk/pym/portage/dbapi/vartree.py
Log:
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.
Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py 2008-10-31 17:25:44 UTC (rev 11764)
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-10-31 18:49:10 UTC (rev 11765)
@@ -2734,10 +2734,12 @@
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:
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2008-10-31 18:49 99% [gentoo-commits] portage r11765 - main/trunk/pym/portage/dbapi Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox