From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QJAwY-0000X9-NQ for garchives@archives.gentoo.org; Sun, 08 May 2011 20:51:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6B041C053; Sun, 8 May 2011 20:50:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 787B61C053 for ; Sun, 8 May 2011 20:50:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D2EF1BC00A for ; Sun, 8 May 2011 20:50:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 99C087448C for ; Sun, 8 May 2011 20:50:12 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <794188c21d30ee7f1ef3d0c81505689b46b1f3bf.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/portage/util/_dyn_libs/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/_dyn_libs/LinkageMapELF.py X-VCS-Directories: pym/portage/util/_dyn_libs/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 794188c21d30ee7f1ef3d0c81505689b46b1f3bf Date: Sun, 8 May 2011 20:50:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 9c47839ff1796c3d139164eba23401e1 commit: 794188c21d30ee7f1ef3d0c81505689b46b1f3bf Author: Zac Medico gentoo org> AuthorDate: Sun May 8 07:09:37 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 8 18:55:22 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D794188c2 linkmap: use exclude_pkgs for the registry too --- 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/ut= il/_dyn_libs/LinkageMapELF.py index 9e79bd8..d856e92 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 =3D ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]