diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-06 07:45:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-06 07:45:19 +0000 |
| commit | 687fe40ea3c3f05d75e2f649e0c3db3f0c4474d0 (patch) | |
| tree | 6c4eab7755e5439904db5b0604a33a807d12fd0c | |
| parent | 2924d703e4cbe5fbd53569a7d469a016a04d5c9f (diff) | |
| download | portage-687fe40ea3c3f05d75e2f649e0c3db3f0c4474d0.tar.gz portage-687fe40ea3c3f05d75e2f649e0c3db3f0c4474d0.tar.bz2 portage-687fe40ea3c3f05d75e2f649e0c3db3f0c4474d0.zip | |
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
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 2 |
1 files changed, 1 insertions, 1 deletions
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" % \ |