From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Tue, 19 Aug 2014 19:39:09 +0000 (-0400)
Subject: always raise exit after handling an exception
X-Git-Tag: v1.5.12~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8569bd86d060a4690fe26150de6307ee3140ab20;p=ceph-deploy.git

always raise exit after handling an exception

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/util/decorators.py b/ceph_deploy/util/decorators.py
index 47664e7..70e002a 100644
--- a/ceph_deploy/util/decorators.py
+++ b/ceph_deploy/util/decorators.py
@@ -72,6 +72,7 @@ def catches(catch=None, handler=None, exit=True, handle_all=False):
                     return handler(e)
                 else:
                     logger.error(make_exception_message(e))
+
                     if exit:
                         exit_from_catch = True
                         sys.exit(1)
@@ -80,12 +81,14 @@ def catches(catch=None, handler=None, exit=True, handle_all=False):
                     raise
                 # Make sure we don't spit double tracebacks if we are raising
                 # SystemExit from the `except catch` block
+
                 if exit_from_catch:
                     sys.exit(1)
 
                 str_failure = traceback.format_exc()
                 for line in str_failure.split('\n'):
                     logger.error("%s" % line)
+                sys.exit(1)
 
         return newfunc