* [gentoo-commits] portage r12152 - in main/trunk/pym: _emerge portage/dbapi
@ 2008-12-04 19:01 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-12-04 19:01 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-12-04 19:01:37 +0000 (Thu, 04 Dec 2008)
New Revision: 12152
Modified:
main/trunk/pym/_emerge/__init__.py
main/trunk/pym/portage/dbapi/vartree.py
Log:
Bug #249805 - Add some more PreservedLibsRegistry.pruneNonExisting() calls,
to avoid a KeyError from LinkageMap.findConsumers() triggered inside
display_preserved_libs().
Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py 2008-12-04 06:57:49 UTC (rev 12151)
+++ main/trunk/pym/_emerge/__init__.py 2008-12-04 19:01:37 UTC (rev 12152)
@@ -11374,6 +11374,9 @@
def display_preserved_libs(vardbapi):
MAX_DISPLAY = 3
+ # Ensure the registry is consistent with existing files.
+ vardbapi.plib_registry.pruneNonExisting()
+
if vardbapi.plib_registry.hasEntries():
print
print colorize("WARN", "!!!") + " existing preserved libs:"
Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py 2008-12-04 06:57:49 UTC (rev 12151)
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-12-04 19:01:37 UTC (rev 12152)
@@ -2062,6 +2062,10 @@
break
continue
self.vartree.dbapi.removeFromContents(cpv, removed)
+ else:
+ # Prune any preserved libs that may have
+ # been unmerged with this package.
+ self.vartree.dbapi.plib_registry.pruneNonExisting()
finally:
if builddir_lock:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-12-04 19:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-04 19:01 [gentoo-commits] portage r12152 - in main/trunk/pym: _emerge portage/dbapi Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox