From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 24 Aug 2010 13:37:40 +0000 (-0700)
Subject: Bug #334253 - Fix breakage in FEATURES=test-fail-continue logic.
X-Git-Tag: v2.2_rc69~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d2c78303bb3bfb5a9174686e4069770602eeda2;p=portage.git

Bug #334253 - Fix breakage in FEATURES=test-fail-continue logic.
---

diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index d0a218b17..58ce0c62c 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -116,7 +116,11 @@ class EbuildPhase(CompositeTask):
 			self._start_task(post_phase, self._post_phase_exit)
 			return
 
-		self.returncode = ebuild_process.returncode
+		# this point is not reachable if there was a failure and
+		# we returned for die_hooks above, so returncode must
+		# indicate success (especially if ebuild_process.returncode
+		# is unsuccessful and test-fail-continue came into play)
+		self.returncode = os.EX_OK
 		self._current_task = None
 		self.wait()