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

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 d3f87ae40..127f0ee8b 100644
--- 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