Make the unmerge time CONFIG_MEMORY_FILE pruning slightly more aggressive,

so that anything not claimed by another package in the same slot is
pruned. (trunk r10474)

svn path=/main/branches/2.1.2/; revision=10475

diff --git a/pym/portage.py b/pym/portage.py
index 1995c494556656050caf56484b7019381f22215f..21f20539acd41d1e2c0de48aad0fd021f91ff3c8 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8979,9 +8979,6 @@ class dblink:
                                                continue
                                if obj.startswith(dest_root):
                                        relative_path = obj[dest_root_len:]
-                                       if not others_in_slot and \
-                                               relative_path in cfgfiledict:
-                                               stale_confmem.append(relative_path)
                                        is_owned = False
                                        for dblnk in others_in_slot:
                                                if dblnk.isowner(relative_path, dest_root):
@@ -8992,6 +8989,8 @@ class dblink:
                                                # don't unmerge it.
                                                show_unmerge("---", "replaced", file_type, obj)
                                                continue
+                                       elif relative_path in cfgfiledict:
+                                               stale_confmem.append(relative_path)
                                # next line includes a tweak to protect modules from being unmerged,
                                # but we don't protect modules from being overwritten if they are
                                # upgraded. We effectively only want one half of the config protection