From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 27 Nov 2007 21:12:26 +0000 (-0000)
Subject: Fix logic wrt exit_status_check and elog_process in doebuild(). (trunk r8710)
X-Git-Tag: v2.1.4~189
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dff45aabc01c5b20f6db2990e6a21ccbe1a02aed;p=portage.git

Fix logic wrt exit_status_check and elog_process in doebuild(). (trunk r8710)

svn path=/main/branches/2.1.2/; revision=8711
---

diff --git a/pym/portage.py b/pym/portage.py
index 9c748aa8b..121df9a75 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4502,7 +4502,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 				alwaysdep=1, logfile=logfile)
 			if retval == os.EX_OK:
 				retval = exit_status_check(retval)
-			else:
+			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
 				# so that it's only called once.