| 1 |
Author: genone |
| 2 |
Date: 2008-05-04 14:16:14 +0000 (Sun, 04 May 2008) |
| 3 |
New Revision: 10182 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
actually remove libraries that aren't strictly needed from the preservation candidate list |
| 9 |
|
| 10 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 11 |
=================================================================== |
| 12 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-05-04 13:33:49 UTC (rev 10181) |
| 13 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-05-04 14:16:14 UTC (rev 10182) |
| 14 |
@@ -1687,6 +1687,7 @@ |
| 15 |
for lib in list(candidates): |
| 16 |
if not has_external_consumers(lib, old_contents, candidates): |
| 17 |
candidates.remove(lib) |
| 18 |
+ continue |
| 19 |
# only preserve the lib if there is no other copy to use for each consumer |
| 20 |
keep = False |
| 21 |
for c in linkmap.findConsumers(lib): |
| 22 |
@@ -1695,12 +1696,15 @@ |
| 23 |
for soname in providers: |
| 24 |
if lib in providers[soname]: |
| 25 |
for p in providers[soname]: |
| 26 |
- if p not in candidates: |
| 27 |
+ if p not in candidates or os.path.exists(os.path.join(srcroot, p.lstrip(os.sep))): |
| 28 |
localkeep = False |
| 29 |
break |
| 30 |
break |
| 31 |
if localkeep: |
| 32 |
keep = True |
| 33 |
+ if not keep: |
| 34 |
+ candidates.remove(lib) |
| 35 |
+ continue |
| 36 |
|
| 37 |
del mylibs, mycontents, old_contents, liblist |
| 38 |
|
| 39 |
|
| 40 |
-- |
| 41 |
gentoo-commits@l.g.o mailing list |
Archives