Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH] Wrap fakeroot around MISC_SH_BINARY calls
Date: Sun, 14 Sep 2014 03:39:32
Message-Id: 54150DEF.9060009@gentoo.org
1 When feature fakeroot is active all pre/post actions need
2 to be called with the fakeroot wrapper.
3
4 Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@×××××××××.se>
5 Signed-off-by: Zac Medico <zmedico@g.o>
6 X-Gentoo-Bug: 489016
7 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=489016
8 ---
9 pym/_emerge/MiscFunctionsProcess.py | 6 +++++-
10 1 file changed, 5 insertions(+), 1 deletion(-)
11
12 diff --git a/pym/_emerge/MiscFunctionsProcess.py b/pym/_emerge/MiscFunctionsProcess.py
13 index bada79d..b7f5892 100644
14 --- a/pym/_emerge/MiscFunctionsProcess.py
15 +++ b/pym/_emerge/MiscFunctionsProcess.py
16 @@ -33,11 +33,15 @@ class MiscFunctionsProcess(AbstractEbuildProcess):
17 if self._dummy_pipe_fd is not None:
18 self.settings["PORTAGE_PIPE_FD"] = str(self._dummy_pipe_fd)
19
20 + if "fakeroot" in self.settings.features:
21 + kwargs["fakeroot"] = True
22 +
23 # Temporarily unset EBUILD_PHASE so that bashrc code doesn't
24 # think this is a real phase.
25 phase_backup = self.settings.pop("EBUILD_PHASE", None)
26 try:
27 - return spawn(" ".join(args), self.settings, **kwargs)
28 + return spawn(" ".join(args), self.settings,
29 + **portage._native_kwargs(kwargs))
30 finally:
31 if phase_backup is not None:
32 self.settings["EBUILD_PHASE"] = phase_backup
33 --
34 1.8.5.5