From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 411FE13829C for ; Mon, 6 Jun 2016 16:03:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BAEA142E9; Mon, 6 Jun 2016 16:03:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A63CF142E9 for ; Mon, 6 Jun 2016 16:03:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A66FD3408DD for ; Mon, 6 Jun 2016 16:03:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C44CA963 for ; Mon, 6 Jun 2016 16:03:22 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1465228859.54d3676d4dc90444895c99c0b6c29d6be6a25b77.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: 54d3676d4dc90444895c99c0b6c29d6be6a25b77 X-VCS-Branch: master Date: Mon, 6 Jun 2016 16:03:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 63180313-dd9d-4746-837b-6cfd12465717 X-Archives-Hash: 9416453f08ccd6db2ea0c03803b406f2 commit: 54d3676d4dc90444895c99c0b6c29d6be6a25b77 Author: Benda Xu gentoo org> AuthorDate: Mon Jun 6 16:00:59 2016 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jun 6 16:00:59 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=54d3676d LinkageMapELF: Account for EPREFIX in scanelf path (bug 583754) X-Gentoo-Bug: 583754 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=583754 pym/portage/util/_dyn_libs/LinkageMapELF.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py index 63e2213..0b09fe5 100644 --- a/pym/portage/util/_dyn_libs/LinkageMapELF.py +++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py @@ -1,4 +1,4 @@ -# Copyright 1998-2013 Gentoo Foundation +# Copyright 1998-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import errno @@ -11,6 +11,7 @@ from portage import _os_merge from portage import _unicode_decode from portage import _unicode_encode from portage.cache.mappings import slot_dict_class +from portage.const import EPREFIX from portage.exception import CommandNotFound, InvalidData from portage.localization import _ from portage.util import getlibpaths @@ -259,7 +260,7 @@ class LinkageMapELF(object): continue plibs.update((x, cpv) for x in items) if plibs: - args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"] + args = [os.path.join(EPREFIX or "/", "usr/bin/scanelf"), "-qF", "%a;%F;%S;%r;%n"] args.extend(os.path.join(root, x.lstrip("." + os.sep)) \ for x in plibs) try: