summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico2011-05-08 07:09:37 (GMT)
committerZac Medico2011-05-08 07:09:37 (GMT)
commit07293a625e1b5ab086119ea1ccf7133eeb86fcee (patch)
tree096e93f5274d9799335481941c648234f0a340fc
parent09cb0079ee6da6fef3eea1043f3e75e89ec954d7 (diff)
linkmap: use exclude_pkgs for the registry too
-rw-r--r--pym/portage/util/_dyn_libs/LinkageMapELF.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py
index 11e32b6..56e6e0c 100644
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py
@@ -205,8 +205,15 @@ class LinkageMapELF(object):
plibs.update(preserve_paths)
if self._dbapi._plib_registry and \
self._dbapi._plib_registry.hasEntries():
- for items in \
- self._dbapi._plib_registry.getPreservedLibs().values():
+ for cpv, items in \
+ self._dbapi._plib_registry.getPreservedLibs().items():
+ if exclude_pkgs is not None and cpv in exclude_pkgs:
+ # These preserved libs will either be unmerged,
+ # rendering them irrelevant, or they will be
+ # preserved in the replacement package and are
+ # already represented via the preserve_paths
+ # parameter.
+ continue
plibs.update(items)
if plibs:
args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]