summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2015-04-09 19:20:25 -0400
committerPatrick Uiterwijk <puiterwijk@redhat.com>2015-04-10 01:44:00 +0200
commit2221f5b909d2fd3f8ba935dc5336392ece395416 (patch)
tree24094c05dfb478c4e8bd1869079411e51cf6b2d3
parent38d9a4c974d7d5b58edefd4857492648a6102d38 (diff)
downloadipsilon-2221f5b909d2fd3f8ba935dc5336392ece395416.zip
ipsilon-2221f5b909d2fd3f8ba935dc5336392ece395416.tar.gz
ipsilon-2221f5b909d2fd3f8ba935dc5336392ece395416.tar.xz
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 <rcritten@redhat.com> Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
-rwxr-xr-xipsilon/install/ipsilon-server-install3
1 files changed, 3 insertions, 0 deletions
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: