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 1QcUwc-0004Ia-JZ for garchives@archives.gentoo.org; Fri, 01 Jul 2011 04:03:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8E071C046; Fri, 1 Jul 2011 04:02:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 788441C046 for ; Fri, 1 Jul 2011 04:02:58 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 643AD1B406F for ; Fri, 1 Jul 2011 04:02:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9D75C8003E for ; Fri, 1 Jul 2011 04:02:56 +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: <038f142cffb8437dbb2e8588078e802d441c3860.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master 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: 038f142cffb8437dbb2e8588078e802d441c3860 Date: Fri, 1 Jul 2011 04:02:56 +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: 863ac154b88e478650aa54632e50e6e0 commit: 038f142cffb8437dbb2e8588078e802d441c3860 Author: Zac Medico gentoo org> AuthorDate: Fri Jul 1 02:23:23 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jul 1 02:23:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D038f142c LinkageMapElf.findConsumers(): fix $ROOT handling The code which checks the soname symlink was missing a join with $ROOT. --- pym/portage/util/_dyn_libs/LinkageMapELF.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/ut= il/_dyn_libs/LinkageMapELF.py index f3a5129..c55d6d6 100644 --- a/pym/portage/util/_dyn_libs/LinkageMapELF.py +++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py @@ -661,9 +661,10 @@ class LinkageMapELF(object): soname =3D self._obj_properties[obj_key][3] soname_link =3D os.path.join(self._root, os.path.dirname(obj).lstrip(os.path.sep), soname) + obj_path =3D os.path.join(self._root, obj.lstrip(os.sep)) try: soname_st =3D os.stat(soname_link) - obj_st =3D os.stat(obj) + obj_st =3D os.stat(obj_path) except OSError: pass else: