summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2015-03-30 21:21:31 -0700
committerRob Crittenden <rcritten@redhat.com>2015-03-31 11:43:06 -0400
commitf7150fdefeb58ab4e33f742969ebbc6019f45b08 (patch)
tree688295f2b4f776f265a957febac6791d5790ac56
parent084c893c7f4639a2ee67ea79008148291af1fafa (diff)
downloadipsilon-f7150fdefeb58ab4e33f742969ebbc6019f45b08.zip
ipsilon-f7150fdefeb58ab4e33f742969ebbc6019f45b08.tar.gz
ipsilon-f7150fdefeb58ab4e33f742969ebbc6019f45b08.tar.xz
SP uninstall attempts to run install
When running 'ipsilon-client-install --uninstall' to uninstall a SP, we call the install routine again after completing the uninstallation. This leads to confusing error messages about missing required options. This patch corrects the uninstallation logic. https://fedorahosted.org/ipsilon/ticket/100 Signed-off-by: Nathan Kinder <nkinder@redhat.com> Reviewed-by: Rob Crittenden <rcritten@redhat.com>
-rwxr-xr-xipsilon/install/ipsilon-client-install4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipsilon/install/ipsilon-client-install b/ipsilon/install/ipsilon-client-install
index 9959cd0..b5b6ad1 100755
--- a/ipsilon/install/ipsilon-client-install
+++ b/ipsilon/install/ipsilon-client-install
@@ -330,8 +330,8 @@ if __name__ == '__main__':
if 'uninstall' in args and args['uninstall'] is True:
uninstall()
-
- install()
+ else:
+ install()
except Exception, e: # pylint: disable=broad-except
log_exception(e)
if 'uninstall' in args and args['uninstall'] is True: