Always check the return value of doebuild_environment().

svn path=/main/trunk/; revision=4513

diff --git a/bin/emerge b/bin/emerge
index c0c82058d5c07573a75fc332c8c3e0a8628e17f1..37c7bc7b18e3b473c8280541d5a0a56c4f63e063 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2014,8 +2014,10 @@ class MergeTask(object):
                                                returnme=1
                                        continue
 
-                               portage.doebuild_environment(y, "setup", myroot,
+                               retval = portage.doebuild_environment(y, "setup", myroot,
                                        pkgsettings, self.edebug, 1, portdb)
+                               if retval != os.EX_OK:
+                                       return retval
                                portage_util.ensure_dirs(
                                        os.path.dirname(pkgsettings["PORTAGE_BUILDDIR"]),
                                        gid=portage.portage_gid, mode=070, mask=02)

diff --git a/pym/portage.py b/pym/portage.py
index 6024f699dcdd28990bbc11656bf913cf92490286..2b9f532cafc1d3433fab4b35233af5d5486f9822 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2632,6 +2632,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
        # Allow color.map to control colors associated with einfo, ewarn, etc...
        for c in ("GOOD", "WARN", "BAD", "HILITE", "BRACKET"):
                mysettings[c] = output.codes[c]
+       return os.EX_OK
 
 def prepare_build_dirs(myroot, mysettings, cleanup):
 
@@ -2843,7 +2844,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 
        mystatus = doebuild_environment(myebuild, mydo, myroot, mysettings, debug,
                use_cache, mydbapi)
-       if mystatus:
+       if mystatus != os.EX_OK:
                return mystatus
 
        # get possible slot information from the deps file