From 237340c444298a346bf20e0d0ea718da9b708292 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 19 Aug 2010 01:58:27 -0700 Subject: Move code from EbuildProcess to EbuildPhase. --- pym/_emerge/EbuildProcess.py | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'pym/_emerge/EbuildProcess.py') diff --git a/pym/_emerge/EbuildProcess.py b/pym/_emerge/EbuildProcess.py index 5ddbc68cc..ce97aff0f 100644 --- a/pym/_emerge/EbuildProcess.py +++ b/pym/_emerge/EbuildProcess.py @@ -4,23 +4,13 @@ from _emerge.AbstractEbuildProcess import AbstractEbuildProcess import portage portage.proxy.lazyimport.lazyimport(globals(), - 'portage.package.ebuild.doebuild:_post_phase_userpriv_perms,' + \ - '_spawn_actionmap,_doebuild_spawn' + 'portage.package.ebuild.doebuild:_doebuild_spawn,_spawn_actionmap' ) -from portage import os class EbuildProcess(AbstractEbuildProcess): __slots__ = ('actionmap',) - 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 - # prevents the clean phase from removing $T. - if self.phase not in ("clean", "cleanrm"): - self.logfile = self.settings.get("PORTAGE_LOG_FILE") - AbstractEbuildProcess._start(self) - def _spawn(self, args, **kwargs): actionmap = self.actionmap @@ -29,13 +19,3 @@ class EbuildProcess(AbstractEbuildProcess): return _doebuild_spawn(self.phase, self.settings, actionmap=actionmap, **kwargs) - - def _set_returncode(self, wait_retval): - AbstractEbuildProcess._set_returncode(self, wait_retval) - - if self.phase == "test" and self.returncode != os.EX_OK and \ - "test-fail-continue" in self.settings.features: - self.returncode = os.EX_OK - - _post_phase_userpriv_perms(self.settings) - -- cgit v1.2.3-1-g7c22