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 684f2a978521e6c0b1b5154a23f4adf6df53c85d..794d785d95fc927eae996c9aac66985d2f9d095b 100755 (executable)
--- 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"))