From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 27 Nov 2007 21:11:24 +0000 (-0000)
Subject: Fix logic wrt exit_status_check and elog_process in doebuild().
X-Git-Tag: v2.2_pre1~297
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e99e56ad18f3efd002773600a3a05551cc679093;p=portage.git

Fix logic wrt exit_status_check and elog_process in doebuild().

svn path=/main/trunk/; revision=8710
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index b6b0e0c0e..d3f87ae40 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4539,7 +4539,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.