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.

svn path=/main/trunk/; revision=10474

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 428e3d24e8ccd0ecf88affa374697c5487c619b8..ed61bcd7cb3b68ce71dd34276024297fe442170d 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1517,9 +1517,6 @@ class dblink(object):
                                                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):
@@ -1530,6 +1527,8 @@ class dblink(object):
                                                # 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