Remove a redundant os.EX_OK check that exit_status_check() already

handles internally.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index d3f87ae4016989ea6df340d43ab253c6392b9c4e..127f0ee8b3b83d071c7ba72376c827439a461e81 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4537,8 +4537,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                elif mydo=="merge":
                        retval = spawnebuild("install", actionmap, mysettings, debug,
                                alwaysdep=1, logfile=logfile)
-                       if retval == os.EX_OK:
-                               retval = exit_status_check(retval)
+                       retval = exit_status_check(retval)
                        if retval != os.EX_OK:
                                # The merge phase handles this already.  Callers don't know how
                                # far this function got, so we have to call elog_process() here