From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 6 Jun 2007 07:45:19 +0000 (-0000)
Subject: For bug #181021, don't compare attributes of contents entries when deciding which... 
X-Git-Tag: v2.2_pre1~1286
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=687fe40ea3c3f05d75e2f649e0c3db3f0c4474d0;p=portage.git

For bug #181021, don't compare attributes of contents entries when deciding which files not to unmerge.  Simply keep any file that's listed in the new contents in order to avoid problematic scenarios such as those described in comments #32 and #40 of bug #8423.

svn path=/main/trunk/; revision=6745
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index a79994f4e..09f08528b 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1145,7 +1145,7 @@ class dblink(object):
 			modprotect = "/lib/modules/"
 			for objkey in mykeys:
 				obj = normalize_path(objkey)
-				if new_contents and new_contents.get(obj) == pkgfiles[objkey]:
+				if new_contents and obj in new_contents:
 					# A new instance of this package claims the file, so don't
 					# unmerge it.
 					writemsg_stdout("--- !owned %s %s\n" % \