| 1 |
Author: zmedico |
| 2 |
Date: 2008-12-04 19:01:37 +0000 (Thu, 04 Dec 2008) |
| 3 |
New Revision: 12152 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
main/trunk/pym/portage/dbapi/vartree.py |
| 8 |
Log: |
| 9 |
Bug #249805 - Add some more PreservedLibsRegistry.pruneNonExisting() calls, |
| 10 |
to avoid a KeyError from LinkageMap.findConsumers() triggered inside |
| 11 |
display_preserved_libs(). |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/_emerge/__init__.py 2008-12-04 06:57:49 UTC (rev 12151) |
| 17 |
+++ main/trunk/pym/_emerge/__init__.py 2008-12-04 19:01:37 UTC (rev 12152) |
| 18 |
@@ -11374,6 +11374,9 @@ |
| 19 |
def display_preserved_libs(vardbapi): |
| 20 |
MAX_DISPLAY = 3 |
| 21 |
|
| 22 |
+ # Ensure the registry is consistent with existing files. |
| 23 |
+ vardbapi.plib_registry.pruneNonExisting() |
| 24 |
+ |
| 25 |
if vardbapi.plib_registry.hasEntries(): |
| 26 |
print |
| 27 |
print colorize("WARN", "!!!") + " existing preserved libs:" |
| 28 |
|
| 29 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 30 |
=================================================================== |
| 31 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-12-04 06:57:49 UTC (rev 12151) |
| 32 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-12-04 19:01:37 UTC (rev 12152) |
| 33 |
@@ -2062,6 +2062,10 @@ |
| 34 |
break |
| 35 |
continue |
| 36 |
self.vartree.dbapi.removeFromContents(cpv, removed) |
| 37 |
+ else: |
| 38 |
+ # Prune any preserved libs that may have |
| 39 |
+ # been unmerged with this package. |
| 40 |
+ self.vartree.dbapi.plib_registry.pruneNonExisting() |
| 41 |
|
| 42 |
finally: |
| 43 |
if builddir_lock: |
Archives