From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 28 Apr 2011 21:07:08 +0000 (-0700)
Subject: display_preserved_libs: load plib_registry
X-Git-Tag: v2.2.0_alpha31~38
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=593b57110c6f441d03d9ae623de9ff99a2e57905;p=portage.git

display_preserved_libs: load plib_registry

Since commit 7535cabdf2fab76fc55df83643157613dfd66be9, the
plib_registry is modified in a subprocess, and the parent
process' copy can become stale because of this. Therefore,
explicitly load it.
---

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 82b1444c5..e0cd0c024 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -217,7 +217,9 @@ def display_preserved_libs(vardbapi, myopts):
 		# preserve-libs is entirely disabled
 		return
 
-	# Ensure the registry is consistent with existing files.
+	# Explicitly load and prune the PreservedLibsRegistry in order
+	# to ensure that we do not display stale data.
+	vardbapi._plib_registry.load()
 	vardbapi._plib_registry.pruneNonExisting()
 
 	if vardbapi._plib_registry.hasEntries():