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

handles internally. (trunk r8712)

svn path=/main/branches/2.1.2/; revision=8713

diff --git a/pym/portage.py b/pym/portage.py
index 121df9a75942e5a01f648a4e84a4ac10230fefcc..dcac711aa1f6896d73e87977cac6b1e94fc45365 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4500,8 +4500,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