From aa313aee5cbdde80b466e8907a81f8625ac1ad22 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 1 Nov 2008 07:09:19 +0000 Subject: Also call PreservedLibsRegistry.pruneNonExisting() after obtaining a lock and loading it for merge or unmerge. svn path=/main/trunk/; revision=11780 --- pym/portage/__init__.py | 1 + pym/portage/dbapi/vartree.py | 1 + 2 files changed, 2 insertions(+) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index d6b2f77df..92c567f1c 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -6067,6 +6067,7 @@ def unmerge(cat, pkg, myroot, mysettings, mytrimworld=1, vartree=None, mylink.lockdb() if mylink.exists(): vartree.dbapi.plib_registry.load() + vartree.dbapi.plib_registry.pruneNonExisting() retval = mylink.unmerge(trimworld=mytrimworld, cleanup=1, ldpath_mtimes=ldpath_mtimes) if retval == os.EX_OK: diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 68e0ecf16..c24039179 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3744,6 +3744,7 @@ class dblink(object): self.lockdb() try: self.vartree.dbapi.plib_registry.load() + self.vartree.dbapi.plib_registry.pruneNonExisting() retval = self.treewalk(mergeroot, myroot, inforoot, myebuild, cleanup=cleanup, mydbapi=mydbapi, prev_mtimes=prev_mtimes) # undo registrations of preserved libraries, bug #210501 -- cgit v1.2.3-1-g7c22