| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-31 18:49:10 +0000 (Fri, 31 Oct 2008) |
| 3 |
New Revision: 11765 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
In dblink._collision_protect(), remove redundant self.isowner() calls since |
| 9 |
self hasn't yet been merged and therefore has no CONTENTS file for ownership |
| 10 |
checks. Also, remove redundant isprotected() calls. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-10-31 17:25:44 UTC (rev 11764) |
| 16 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-10-31 18:49:10 UTC (rev 11765) |
| 17 |
@@ -2734,10 +2734,12 @@ |
| 18 |
f="/"+f |
| 19 |
isowned = False |
| 20 |
full_path = os.path.join(destroot, f.lstrip(os.path.sep)) |
| 21 |
- for ver in [self] + mypkglist: |
| 22 |
- if (ver.isowner(f, destroot) or ver.isprotected(full_path)): |
| 23 |
+ for ver in mypkglist: |
| 24 |
+ if ver.isowner(f, destroot): |
| 25 |
isowned = True |
| 26 |
break |
| 27 |
+ if not isowned and self.isprotected(full_path): |
| 28 |
+ isowned = True |
| 29 |
if not isowned: |
| 30 |
stopmerge = True |
| 31 |
if collision_ignore: |
Archives