From: Rob Crittenden Date: Thu, 9 Apr 2015 23:20:25 +0000 (-0400) Subject: If sys.exit is called or SystemExit raised, don't display success X-Git-Tag: v0.6.0~17 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=2221f5b909d2fd3f8ba935dc5336392ece395416 If sys.exit is called or SystemExit raised, don't display success If sys.exit is called, which raises SystemExit, the finally at the end of the installer was treating it as a successful install and displaying messages to the user. Catch this exception and mark the install as failed to prevent this. https://fedorahosted.org/ipsilon/ticket/66 Signed-off-by: Rob Crittenden Reviewed-by: Patrick Uiterwijk --- diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install index 67877a6..5ab163b 100755 --- a/ipsilon/install/ipsilon-server-install +++ b/ipsilon/install/ipsilon-server-install @@ -413,6 +413,9 @@ if __name__ == '__main__': print 'Installation aborted.' print 'See log file %s for details' % LOGFILE out = 1 + except SystemExit: + out = 1 + raise finally: if out == 0: if 'uninstall' in opts and opts['uninstall'] is True: