IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-27 09:21:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipaserver.install.service: Don't show error message on SystemExit(0)

Browse Source 
Additional fix for: https://fedorahosted.org/freeipa/ticket/4499

Reviewed-By: Martin Kosek <mkosek@redhat.com>
This commit is contained in:
Petr Viktorin 2014-09-26 12:43:18 +02:00 committed by Martin Kosek
parent 89c4f12425
commit f866186239
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipaserver/install/service.py
View File

@ -370,14 +370,15 @@ class Service(object):
run_step(full_msg, method)
step += 1
except BaseException as e:
# show the traceback, so it's not lost if the cleanup method fails
root_logger.debug("%s" % traceback.format_exc())
self.print_msg(' [error] %s: %s' % (type(e).__name__, e))
if not (isinstance(e, SystemExit) and e.code == 0):
# show the traceback, so it's not lost if cleanup method fails
root_logger.debug("%s" % traceback.format_exc())
self.print_msg(' [error] %s: %s' % (type(e).__name__, e))
# run through remaining methods marked run_after_failure
for message, method, run_after_failure in steps_iter:
if run_after_failure:
run_step(" [cleanup]: %s" % message, method)
# run through remaining methods marked run_after_failure
for message, method, run_after_failure in steps_iter:
if run_after_failure:
run_step(" [cleanup]: %s" % message, method)
raise