| 1 |
commit: 329564d1ecaff96f894283200906c2c22a1ede7e |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 28 21:07:08 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 4 19:34:07 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=329564d1 |
| 7 |
|
| 8 |
display_preserved_libs: load plib_registry |
| 9 |
|
| 10 |
Since commit 7535cabdf2fab76fc55df83643157613dfd66be9, the |
| 11 |
plib_registry is modified in a subprocess, and the parent |
| 12 |
process' copy can become stale because of this. Therefore, |
| 13 |
explicitly load it. |
| 14 |
|
| 15 |
--- |
| 16 |
pym/_emerge/main.py | 4 +++- |
| 17 |
1 files changed, 3 insertions(+), 1 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
| 20 |
index fa83556..7d7fee2 100644 |
| 21 |
--- a/pym/_emerge/main.py |
| 22 |
+++ b/pym/_emerge/main.py |
| 23 |
@@ -217,7 +217,9 @@ def display_preserved_libs(vardbapi, myopts): |
| 24 |
# preserve-libs is entirely disabled |
| 25 |
return |
| 26 |
|
| 27 |
- # Ensure the registry is consistent with existing files. |
| 28 |
+ # Explicitly load and prune the PreservedLibsRegistry in order |
| 29 |
+ # to ensure that we do not display stale data. |
| 30 |
+ vardbapi._plib_registry.load() |
| 31 |
vardbapi._plib_registry.pruneNonExisting() |
| 32 |
|
| 33 |
if vardbapi._plib_registry.hasEntries(): |
Archives