diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-08 00:09:37 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-08 00:09:37 -0700 |
| commit | 07293a625e1b5ab086119ea1ccf7133eeb86fcee (patch) | |
| tree | 096e93f5274d9799335481941c648234f0a340fc /pym/portage/util/_dyn_libs | |
| parent | 09cb0079ee6da6fef3eea1043f3e75e89ec954d7 (diff) | |
| download | portage-07293a625e1b5ab086119ea1ccf7133eeb86fcee.tar.gz portage-07293a625e1b5ab086119ea1ccf7133eeb86fcee.tar.bz2 portage-07293a625e1b5ab086119ea1ccf7133eeb86fcee.zip | |
linkmap: use exclude_pkgs for the registry too
Diffstat (limited to 'pym/portage/util/_dyn_libs')
| -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 11e32b6b9..56e6e0c84 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"] |