Use return values instead of direct sys.exit(123) calls when a merge fails.

svn path=/main/trunk/; revision=5432

1 files changed, 2 insertions, 2 deletions

diff --git a/bin/emerge b/bin/emerge
index 4865b2ce..24f1f91d 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3015,8 +3015,8 @@ class MergeTask(object):
 					mydbapi=bindb,
 					vartree=self.trees[myroot]["vartree"],
 					prev_mtimes=ldpath_mtimes)
-				if retval is None:
-					sys.exit(1)
+				if retval != os.EX_OK:
+					return retval
 				#need to check for errors
 			if "--buildpkgonly" not in self.myopts:
 				self.trees[x[1]]["vartree"].inject(x[2])