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 b99ff27242243422207c53cc648c1bbc9b9d0e68..495019d7c75ddd85805aa0ebdf8751451b695504 100644 (file)
--- 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"))