summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2010-04-27 17:51:13 -0400
committerRob Crittenden <rcritten@redhat.com>2010-04-27 17:51:13 -0400
commitac696a522084901bad12272b9b9a73a28eab29bc (patch)
treeda79df281fbc070ac805362375b659c8a6325969
parenta8409b7db15d28b3b938e4a0e93dd1c3e3a6a960 (diff)
downloadfreeipa-ac696a522084901bad12272b9b9a73a28eab29bc.tar.gz
freeipa-ac696a522084901bad12272b9b9a73a28eab29bc.tar.xz
freeipa-ac696a522084901bad12272b9b9a73a28eab29bc.zip
Fix a couple of syntax errors in the installer.
I meant to push these along with the original patch but pushed the wrong one.
-rwxr-xr-xinstall/tools/ipa-server-install7
1 files changed, 5 insertions, 2 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 5aed0437f..149cdd783 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -59,6 +59,7 @@ from ipalib import api, errors, util
import ipawebui
pw_name = None
+uninstalling = False
# Used to determine the the highest possible uid/gid
MAXINT_32BIT = 2147483648
@@ -436,6 +437,7 @@ def set_subject_in_config(host_name, dm_password, suffix, subject_base):
def main():
global ds
global pw_name
+ global uninstalling
ds = None
options = parse_options()
@@ -448,6 +450,7 @@ def main():
signal.signal(signal.SIGINT, signal_handler)
if options.uninstall:
+ uninstalling = True
standard_logging_setup("/var/log/ipaserver-uninstall.log", options.debug)
else:
standard_logging_setup("/var/log/ipaserver-install.log", options.debug)
@@ -846,9 +849,9 @@ try:
except SystemExit, e:
sys.exit(e)
except Exception, e:
- if options.uninstall:
+ if uninstalling:
message = "Unexpected error - see ipaserver-uninstall.log for details:\n %s" % str(e)
- else
+ else:
message = "Unexpected error - see ipaserver-install.log for details:\n %s" % str(e)
print message
message = str(e)