summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-27 21:17:21 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-27 21:17:21 +0000
commit69f6c88ad23fd89c46593d8369f1127b56a782f0 (patch)
treecc638afea24c52123d8a8d6ab5bd07941a59ee21
parentdff45aabc01c5b20f6db2990e6a21ccbe1a02aed (diff)
downloadportage-69f6c88ad23fd89c46593d8369f1127b56a782f0.tar.gz
portage-69f6c88ad23fd89c46593d8369f1127b56a782f0.tar.bz2
portage-69f6c88ad23fd89c46593d8369f1127b56a782f0.zip
Remove a redundant os.EX_OK check that exit_status_check() already
handles internally. (trunk r8712) svn path=/main/branches/2.1.2/; revision=8713
-rw-r--r--pym/portage.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 121df9a75..dcac711aa 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4500,8 +4500,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