From 794188c21d30ee7f1ef3d0c81505689b46b1f3bf Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 8 May 2011 00:09:37 -0700 Subject: [PATCH] linkmap: use exclude_pkgs for the registry too --- pym/portage/util/_dyn_libs/LinkageMapELF.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py index 9e79bd888..d856e9259 100644 --- a/pym/portage/util/_dyn_libs/LinkageMapELF.py +++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py @@ -198,8 +198,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"] -- 2.26.2