From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 29 May 2008 04:56:18 +0000 (-0000)
Subject: Make the unmerge time CONFIG_MEMORY_FILE pruning slightly more aggressive,
X-Git-Tag: v2.1.5.3~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95eabb177220170143cad3b7d805447bf44500ab;p=portage.git

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 1995c4945..21f20539a 100644
--- 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