From 71e9c8caf63805b8350c215ee27070d465115eee Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 17 Aug 2010 01:22:58 -0700 Subject: Fix _spawn_phase() to spawn phases without sandbox when necessary. --- pym/_emerge/EbuildProcess.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'pym/_emerge/EbuildProcess.py') diff --git a/pym/_emerge/EbuildProcess.py b/pym/_emerge/EbuildProcess.py index 50edaa16d..70c724314 100644 --- a/pym/_emerge/EbuildProcess.py +++ b/pym/_emerge/EbuildProcess.py @@ -5,7 +5,7 @@ from _emerge.AbstractEbuildProcess import AbstractEbuildProcess import portage portage.proxy.lazyimport.lazyimport(globals(), 'portage.package.ebuild.doebuild:_post_phase_userpriv_perms,' + \ - '_spawn_actionmap,spawn@doebuild_spawn' + '_spawn_actionmap,_unsandboxed_phases,spawn@doebuild_spawn' ) from portage import _shell_quote from portage import os @@ -15,12 +15,6 @@ class EbuildProcess(AbstractEbuildProcess): __slots__ = ('actionmap',) - _unsandboxed_phases = frozenset([ - "clean", "cleanrm", "config", - "help", "info", "postinst", - "preinst", "pretend", "postrm", - "prerm", "setup"]) - def _start(self): # Don't open the log file during the clean phase since the # open file can result in an nfs lock on $T/build.log which @@ -31,7 +25,7 @@ class EbuildProcess(AbstractEbuildProcess): def _spawn(self, args, **kwargs): self.settings["EBUILD_PHASE"] = self.phase - if self.phase in self._unsandboxed_phases: + if self.phase in _unsandboxed_phases: kwargs['free'] = True if self.phase == 'depend': kwargs['droppriv'] = 'userpriv' in self.settings.features -- cgit v1.2.3-1-g7c22