aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-12 04:21:05 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-12 04:21:05 -0700
commit0fdc6157b824b727fbcffb6c1ea28ba8b79ec9e4 (patch)
tree08a04925fe41a9aaae116af9b176d47d678b814f /pym/_emerge/EbuildSpawnProcess.py
parentFix lazyimport() to handle partially imported modules by creating (diff)
downloadportage-0fdc6157b824b727fbcffb6c1ea28ba8b79ec9e4.tar.gz
portage-0fdc6157b824b727fbcffb6c1ea28ba8b79ec9e4.tar.bz2
portage-0fdc6157b824b727fbcffb6c1ea28ba8b79ec9e4.zip
Consolidate EBUILD_EXIT_STATUS_FILE handling in doebuild.spawn()
and subclasses of AbstractEbuildProcess.
Diffstat (limited to 'pym/_emerge/EbuildSpawnProcess.py')
-rw-r--r--pym/_emerge/EbuildSpawnProcess.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/pym/_emerge/EbuildSpawnProcess.py b/pym/_emerge/EbuildSpawnProcess.py
index e19a04051..36ec0a0c9 100644
--- a/pym/_emerge/EbuildSpawnProcess.py
+++ b/pym/_emerge/EbuildSpawnProcess.py
@@ -4,6 +4,9 @@
from _emerge.AbstractEbuildProcess import AbstractEbuildProcess
import portage
from portage import os
+portage.proxy.lazyimport.lazyimport(globals(),
+ 'portage.package.ebuild.doebuild:_doebuild_exit_status_check_and_log'
+)
class EbuildSpawnProcess(AbstractEbuildProcess):
"""
@@ -20,3 +23,11 @@ class EbuildSpawnProcess(AbstractEbuildProcess):
def _spawn(self, args, **kwargs):
return self.spawn_func(args, **kwargs)
+
+ def _set_returncode(self, wait_retval):
+ AbstractEbuildProcess._set_returncode(self, wait_retval)
+ phase = self.settings.get("EBUILD_PHASE")
+ if not phase:
+ phase = 'other'
+ self.returncode = _doebuild_exit_status_check_and_log(
+ self.settings, phase, self.returncode)