diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-08 00:09:37 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-08 11:55:22 -0700 |
| commit | 794188c21d30ee7f1ef3d0c81505689b46b1f3bf (patch) | |
| tree | c015607a5acd4750af3800ced096974ac21b9770 | |
| parent | 1c8ec672ea685d346e355b7e44416b2258bc66bd (diff) | |
| download | portage-794188c21d30ee7f1ef3d0c81505689b46b1f3bf.tar.gz portage-794188c21d30ee7f1ef3d0c81505689b46b1f3bf.tar.bz2 portage-794188c21d30ee7f1ef3d0c81505689b46b1f3bf.zip | |
linkmap: use exclude_pkgs for the registry too
| -rw-r--r-- | pym/portage/util/_dyn_libs/LinkageMapELF.py | 11 |
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 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"] |