| 1 |
commit: 07293a625e1b5ab086119ea1ccf7133eeb86fcee |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 8 07:09:37 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 8 07:09:37 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=07293a62 |
| 7 |
|
| 8 |
linkmap: use exclude_pkgs for the registry too |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 11 +++++++++-- |
| 12 |
1 files changed, 9 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 15 |
index 11e32b6..56e6e0c 100644 |
| 16 |
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 17 |
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 18 |
@@ -205,8 +205,15 @@ class LinkageMapELF(object): |
| 19 |
plibs.update(preserve_paths) |
| 20 |
if self._dbapi._plib_registry and \ |
| 21 |
self._dbapi._plib_registry.hasEntries(): |
| 22 |
- for items in \ |
| 23 |
- self._dbapi._plib_registry.getPreservedLibs().values(): |
| 24 |
+ for cpv, items in \ |
| 25 |
+ self._dbapi._plib_registry.getPreservedLibs().items(): |
| 26 |
+ if exclude_pkgs is not None and cpv in exclude_pkgs: |
| 27 |
+ # These preserved libs will either be unmerged, |
| 28 |
+ # rendering them irrelevant, or they will be |
| 29 |
+ # preserved in the replacement package and are |
| 30 |
+ # already represented via the preserve_paths |
| 31 |
+ # parameter. |
| 32 |
+ continue |
| 33 |
plibs.update(items) |
| 34 |
if plibs: |
| 35 |
args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"] |
Archives