For bug #181021, don't compare attributes of contents entries when deciding which...

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index a79994f4e9fa9353e7dee50d4c9461caf273f8e1..09f08528bf44dbc62d4ee8620c2c7328fee5fbc3 100644 (file)
--- 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" % \