From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 24 Mar 2007 21:42:57 +0000 (-0000)
Subject: return from the merge task instead of calling sys.exit directly. (trunk r6274:6275)
X-Git-Tag: v2.1.2.3~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=024c1538624e4d98c5f1f70fa74e93cf61df96b8;p=portage.git

return from the merge task instead of calling sys.exit directly. (trunk r6274:6275)

svn path=/main/branches/2.1.2/; revision=6276
---

diff --git a/bin/emerge b/bin/emerge
index 684f2a978..794d785d9 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2903,12 +2903,7 @@ class MergeTask(object):
 					print   "!!!        Please use 'emerge --pretend' to determine blockers."
 					if "--quiet" not in self.myopts:
 						show_blocker_docs_link()
-					if "--pretend" not in self.myopts:
-						try:
-							del mtimedb["resume"]
-						except KeyError:
-							pass
-						sys.exit(1)
+					return 1
 
 		#buildsyspkg: I need mysysdict also on resume (moved from the else block)
 		mysysdict = genericdict(getlist(self.settings, "system"))