From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Nov 2008 07:09:19 +0000 (-0000)
Subject: Also call PreservedLibsRegistry.pruneNonExisting() after obtaining a lock
X-Git-Tag: v2.2_rc13~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa313aee5cbdde80b466e8907a81f8625ac1ad22;p=portage.git

Also call PreservedLibsRegistry.pruneNonExisting() after obtaining a lock
and loading it for merge or unmerge.

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

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