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 BE84A13829C for ; Mon, 6 Jun 2016 15:51:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4B4E1430A; Mon, 6 Jun 2016 15:50:58 +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 66C491430A for ; Mon, 6 Jun 2016 15:50:58 +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 EE6D9340BA2 for ; Mon, 6 Jun 2016 15:50:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E9A9963 for ; Mon, 6 Jun 2016 15:50:54 +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: <1465228197.67239a3f48989794ffe484206bc6afc40156d9db.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/prepare_build_dirs.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 67239a3f48989794ffe484206bc6afc40156d9db X-VCS-Branch: master Date: Mon, 6 Jun 2016 15:50:54 +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: 1e0c03e6-84ce-4188-89ef-e9f900416ecc X-Archives-Hash: 1a65a24565283861940684a1dd10a10b commit: 67239a3f48989794ffe484206bc6afc40156d9db Author: Benda Xu gentoo org> AuthorDate: Mon Jun 6 15:48:01 2016 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jun 6 15:49:57 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=67239a3f Account for EPREFIX in ccache and distcc dirs (bug 582802) X-Gentoo-Bug: 582802 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=582802 pym/portage/package/ebuild/prepare_build_dirs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py index ce54fdf..7fdac74 100644 --- a/pym/portage/package/ebuild/prepare_build_dirs.py +++ b/pym/portage/package/ebuild/prepare_build_dirs.py @@ -19,6 +19,7 @@ from portage.localization import _ from portage.output import colorize from portage.util import apply_recursive_permissions, \ apply_secpass_permissions, ensure_dirs, normalize_path, writemsg +from portage.const import EPREFIX def prepare_build_dirs(myroot=None, settings=None, cleanup=False): """ @@ -153,12 +154,12 @@ def _prepare_features_dirs(mysettings): features_dirs = { "ccache":{ - "path_dir": "/usr/%s/ccache/bin" % (libdir,), + "path_dir": "%s/usr/%s/ccache/bin" % (EPREFIX, libdir), "basedir_var":"CCACHE_DIR", "default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache"), "always_recurse":False}, "distcc":{ - "path_dir": "/usr/%s/distcc/bin" % (libdir,), + "path_dir": "%s/usr/%s/distcc/bin" % (EPREFIX, libdir), "basedir_var":"DISTCC_DIR", "default_dir":os.path.join(mysettings["BUILD_PREFIX"], ".distcc"), "subdirs":("lock", "state"),