From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 23 Sep 2006 19:01:03 +0000 (-0000)
Subject: Remove doebuild_environment return value checks since it no raises and exception... 
X-Git-Tag: v2.1.1-r1~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9fd6baa322a53a6aa538941a2407528c4d701d0f;p=portage.git

Remove doebuild_environment return value checks since it no raises and exception if necessary.

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

diff --git a/bin/emerge b/bin/emerge
index 37c7bc7b1..c0c82058d 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2014,10 +2014,8 @@ class MergeTask(object):
 						returnme=1
 					continue
 
-				retval = portage.doebuild_environment(y, "setup", myroot,
+				portage.doebuild_environment(y, "setup", myroot,
 					pkgsettings, self.edebug, 1, portdb)
-				if retval != os.EX_OK:
-					return retval
 				portage_util.ensure_dirs(
 					os.path.dirname(pkgsettings["PORTAGE_BUILDDIR"]),
 					gid=portage.portage_gid, mode=070, mask=02)
diff --git a/pym/portage.py b/pym/portage.py
index 4d07a3bc6..a68a2be73 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2631,7 +2631,6 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
 	# Allow color.map to control colors associated with einfo, ewarn, etc...
 	for c in ("GOOD", "WARN", "BAD", "HILITE", "BRACKET"):
 		mysettings[c] = output.codes[c]
-	return os.EX_OK
 
 def prepare_build_dirs(myroot, mysettings, cleanup):
 
@@ -2841,10 +2840,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 			noiselevel=-1)
 		return 1
 
-	mystatus = doebuild_environment(myebuild, mydo, myroot, mysettings, debug,
+	doebuild_environment(myebuild, mydo, myroot, mysettings, debug,
 		use_cache, mydbapi)
-	if mystatus != os.EX_OK:
-		return mystatus
 
 	# get possible slot information from the deps file
 	if mydo=="depend":
@@ -5753,10 +5750,8 @@ class dblink:
 
 		self.settings.load_infodir(self.dbdir)
 		if myebuildpath:
-			retval = doebuild_environment(myebuildpath, "prerm", self.myroot,
+			doebuild_environment(myebuildpath, "prerm", self.myroot,
 				self.settings, 0, 0, self.vartree.dbapi)
-			if retval != os.EX_OK:
-				sys.exit(retval)
 			portage_util.ensure_dirs(
 				os.path.dirname(self.settings["PORTAGE_BUILDDIR"]),
 				gid=portage_gid, mode=070, mask=02)