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

return from the merge task instead of calling sys.exit directly.

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index b99ff2724..495019d7c 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2931,12 +2931,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"))