From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 27 Nov 2007 21:17:21 +0000 (-0000)
Subject: Remove a redundant os.EX_OK check that exit_status_check() already
X-Git-Tag: v2.1.4~188
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=69f6c88ad23fd89c46593d8369f1127b56a782f0;p=portage.git

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 121df9a75..dcac711aa 100644
--- 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