summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-27 21:16:53 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-27 21:16:53 +0000
commit0363a5b7bc65a86c2e500a0f3018d6a83b721acf (patch)
tree77f7492562be013384ef419132dfbcafc405c788
parente99e56ad18f3efd002773600a3a05551cc679093 (diff)
downloadportage-0363a5b7bc65a86c2e500a0f3018d6a83b721acf.tar.gz
portage-0363a5b7bc65a86c2e500a0f3018d6a83b721acf.tar.bz2
portage-0363a5b7bc65a86c2e500a0f3018d6a83b721acf.zip
Remove a redundant os.EX_OK check that exit_status_check() already
handles internally. svn path=/main/trunk/; revision=8712
-rw-r--r--pym/portage/__init__.py3
1 files changed, 1 insertions, 2 deletions
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