From 2f508a0f40252ad00b8055d27818647d0d0f5970 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 16 Aug 2010 20:59:24 -0700 Subject: Make spawnebuild() use EbuildPhase to eliminate duplicate code. --- pym/_emerge/EbuildPhase.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'pym/_emerge/EbuildPhase.py') diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py index 55f50b3db..5680925e4 100644 --- a/pym/_emerge/EbuildPhase.py +++ b/pym/_emerge/EbuildPhase.py @@ -4,11 +4,13 @@ from _emerge.MiscFunctionsProcess import MiscFunctionsProcess from _emerge.EbuildProcess import EbuildProcess from _emerge.CompositeTask import CompositeTask -from portage.package.ebuild.doebuild import _check_build_log, \ - _post_phase_cmds, _post_src_install_chost_fix, \ - _post_src_install_uid_fix from portage.util import writemsg, writemsg_stdout import portage +portage.proxy.lazyimport.lazyimport(globals(), + 'portage.package.ebuild.doebuild:_check_build_log,' + \ + '_post_phase_cmds,_post_src_install_chost_fix,' + \ + '_post_src_install_uid_fix' +) from portage import os from portage import _encodings from portage import _unicode_decode @@ -17,12 +19,13 @@ import codecs class EbuildPhase(CompositeTask): - __slots__ = ("background", "phase", + __slots__ = ("actionmap", "background", "phase", "scheduler", "settings") def _start(self): - ebuild_process = EbuildProcess(background=self.background, + ebuild_process = EbuildProcess(actionmap=self.actionmap, + background=self.background, phase=self.phase, scheduler=self.scheduler, settings=self.settings) -- cgit v1.2.3-1-g7c22