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 CAEB51393DD for ; Mon, 15 Sep 2014 05:00:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93707E0942; Mon, 15 Sep 2014 05:00:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEBD3E0942 for ; Mon, 15 Sep 2014 05:00:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A04EF340222 for ; Mon, 15 Sep 2014 05:00:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89EB6588D for ; Mon, 15 Sep 2014 05:00:49 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1410753534.dd2f7f91713bb3a5a14635c7930885fab99c5b17.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/MiscFunctionsProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: dd2f7f91713bb3a5a14635c7930885fab99c5b17 X-VCS-Branch: master Date: Mon, 15 Sep 2014 05:00:49 +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: abfc0c28-2727-4016-9236-c114019fe18e X-Archives-Hash: fd9ea25804bfa498e8aaecd50cc3d7ba commit: dd2f7f91713bb3a5a14635c7930885fab99c5b17 Author: Joakim Tjernlund transmode se> AuthorDate: Mon Jul 21 14:00:06 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Mon Sep 15 03:58:54 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dd2f7f91 Wrap fakeroot around MISC_SH_BINARY calls When feature fakeroot is active all pre/post actions need to be called with the fakeroot wrapper. Signed-off-by: Joakim Tjernlund transmode.se> --- pym/_emerge/MiscFunctionsProcess.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/MiscFunctionsProcess.py b/pym/_emerge/MiscFunctionsProcess.py index bada79d..b7f5892 100644 --- a/pym/_emerge/MiscFunctionsProcess.py +++ b/pym/_emerge/MiscFunctionsProcess.py @@ -33,11 +33,15 @@ class MiscFunctionsProcess(AbstractEbuildProcess): if self._dummy_pipe_fd is not None: self.settings["PORTAGE_PIPE_FD"] = str(self._dummy_pipe_fd) + if "fakeroot" in self.settings.features: + kwargs["fakeroot"] = True + # Temporarily unset EBUILD_PHASE so that bashrc code doesn't # think this is a real phase. phase_backup = self.settings.pop("EBUILD_PHASE", None) try: - return spawn(" ".join(args), self.settings, **kwargs) + return spawn(" ".join(args), self.settings, + **portage._native_kwargs(kwargs)) finally: if phase_backup is not None: self.settings["EBUILD_PHASE"] = phase_backup