linkmap: use exclude_pkgs for the registry too
authorZac Medico <zmedico@gentoo.org>
Sun, 8 May 2011 07:09:37 +0000 (00:09 -0700)
committerZac Medico <zmedico@gentoo.org>
Sun, 8 May 2011 07:09:37 +0000 (00:09 -0700)
pym/portage/util/_dyn_libs/LinkageMapELF.py

index 11e32b6b9d083b9c2594a1761bac6a5110643fe4..56e6e0c84cba3819837533b69d25d46f6873373a 100644 (file)
@@ -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"]