| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-29 04:56:18 +0000 (Thu, 29 May 2008) |
| 3 |
New Revision: 10475 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/pym/portage.py |
| 7 |
Log: |
| 8 |
Make the unmerge time CONFIG_MEMORY_FILE pruning slightly more aggressive, |
| 9 |
so that anything not claimed by another package in the same slot is |
| 10 |
pruned. (trunk r10474) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/pym/portage.py |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/pym/portage.py 2008-05-29 04:53:15 UTC (rev 10474) |
| 16 |
+++ main/branches/2.1.2/pym/portage.py 2008-05-29 04:56:18 UTC (rev 10475) |
| 17 |
@@ -8979,9 +8979,6 @@ |
| 18 |
continue |
| 19 |
if obj.startswith(dest_root): |
| 20 |
relative_path = obj[dest_root_len:] |
| 21 |
- if not others_in_slot and \ |
| 22 |
- relative_path in cfgfiledict: |
| 23 |
- stale_confmem.append(relative_path) |
| 24 |
is_owned = False |
| 25 |
for dblnk in others_in_slot: |
| 26 |
if dblnk.isowner(relative_path, dest_root): |
| 27 |
@@ -8992,6 +8989,8 @@ |
| 28 |
# don't unmerge it. |
| 29 |
show_unmerge("---", "replaced", file_type, obj) |
| 30 |
continue |
| 31 |
+ elif relative_path in cfgfiledict: |
| 32 |
+ stale_confmem.append(relative_path) |
| 33 |
# next line includes a tweak to protect modules from being unmerged, |
| 34 |
# but we don't protect modules from being overwritten if they are |
| 35 |
# upgraded. We effectively only want one half of the config protection |
| 36 |
|
| 37 |
-- |
| 38 |
gentoo-commits@l.g.o mailing list |
Archives