summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage/dbapi/vartree.py22
1 files changed, 13 insertions, 9 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e0cc8e45b..874a0e501 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2004,6 +2004,16 @@ class dblink(object):
outfile.flush()
outfile.close()
+ # These caches are populated during collision-protect and the data
+ # they contain is now invalid. It's very important to invalidate
+ # the contents_inodes cache so that FEATURES=unmerge-orphans
+ # doesn't unmerge anything that belongs to this package that has
+ # just been merged.
+ others_in_slot.append(self) # self has just been merged
+ for dblnk in others_in_slot:
+ dblnk.contentscache = None
+ dblnk._contents_inodes = None
+
# If portage is reinstalling itself, remove the old
# version now since we want to use the temporary
# PORTAGE_BIN_PATH that will be removed when we return.
@@ -2013,19 +2023,13 @@ class dblink(object):
"portage" == pkgsplit(self.pkg)[0]:
reinstall_self = True
- for dblnk in others_in_slot:
+ for dblnk in list(others_in_slot):
+ if dblnk is self:
+ continue
if dblnk.mycpv != self.mycpv and \
not reinstall_self:
continue
writemsg_stdout(">>> Safely unmerging already-installed instance...\n")
- # These caches are populated during collision-protect and the data
- # they contain is now invalid. It's very important to invalidate
- # the contents_inodes cache so that FEATURES=unmerge-orphans
- # doesn't unmerge anything that belongs to this package that has
- # just been merged.
- self.contentscache = None
- self._contents_inodes = None
- others_in_slot.append(self) # self has just been merged
others_in_slot.remove(dblnk) # dblnk will unmerge itself now
dblnk.unmerge(trimworld=0, ldpath_mtimes=prev_mtimes,
others_in_slot=others_in_slot)