From 38c05850c256db116fae08f85210ef206b1044c4 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Jul 24 2013 08:00:33 +0000 Subject: Print newline after receiving EOF in installutils.read_password. --- diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index 0b8b23d..f1cc8c5 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -125,7 +125,7 @@ def main(): except KeyboardInterrupt: sys.exit(0) if dirman_password is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") if not options.admin_password and not options.skip_conncheck and \ options.unattended: diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage index 87fa47f..7061a3e 100755 --- a/install/tools/ipa-compat-manage +++ b/install/tools/ipa-compat-manage @@ -98,7 +98,7 @@ def main(): else: dirman_password = get_dirman_password() if dirman_password is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") api.bootstrap(context='cli', debug=options.debug) api.finalize() diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index 4e11ffd..ce027be 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -401,7 +401,7 @@ def main(): dirman_passwd = installutils.read_password("Directory Manager", confirm=False, validate=False, retry=False) if dirman_passwd is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") options.dirman_passwd = dirman_passwd diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 47bc31b..275e699 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -142,7 +142,7 @@ def main(): dm_password = options.dm_password or read_password("Directory Manager", confirm=False, validate=False) if dm_password is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") bind = bindinstance.BindInstance(fstore, dm_password) # try the connection diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries index 5bf3ad6..2cf37e2 100755 --- a/install/tools/ipa-managed-entries +++ b/install/tools/ipa-managed-entries @@ -95,7 +95,7 @@ def main(): except errors.ACIError: dirman_password = get_dirman_password() if dirman_password is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") try: conn.do_simple_bind(bindpw=dirman_password) except errors.ACIError: diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage index a35e19f..71c0761 100755 --- a/install/tools/ipa-nis-manage +++ b/install/tools/ipa-nis-manage @@ -108,7 +108,7 @@ def main(): else: dirman_password = get_dirman_password() if dirman_password is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") if not dirman_password: sys.exit("No password supplied") diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck index 3b0b1d0..583b5d5 100755 --- a/install/tools/ipa-replica-conncheck +++ b/install/tools/ipa-replica-conncheck @@ -340,7 +340,7 @@ def main(): password = installutils.read_password(principal, confirm=False, validate=False, retry=False) if password is None: - sys.exit("\nPrincipal password required") + sys.exit("Principal password required") stderr='' diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 063ecfb..3d912fc 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -480,7 +480,7 @@ def main(): except KeyboardInterrupt: sys.exit(0) if dirman_password is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") try: top_dir, dir = expand_replica_info(filename, dirman_password) diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index 2fb32fa..e2bd38e 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -1178,7 +1178,7 @@ def main(): dirman_passwd = installutils.read_password("Directory Manager", confirm=False, validate=False, retry=False) if dirman_passwd is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") options.dirman_passwd = dirman_passwd diff --git a/install/tools/ipa-server-certinstall b/install/tools/ipa-server-certinstall index bc4dde2..5b498b1 100755 --- a/install/tools/ipa-server-certinstall +++ b/install/tools/ipa-server-certinstall @@ -141,7 +141,7 @@ def main(): dm_password = installutils.read_password("Directory Manager", confirm=False, validate=False, retry=False) if dm_password is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") realm = get_realm_name() dirname = dsinstance.config_dirname(dsinstance.realm_to_serverid(realm)) fd = open(dirname + "/pwdfile.txt") diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 0d3c4d9..ad0a57c 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -666,7 +666,7 @@ def main(): else: dm_password = read_password("Directory Manager", confirm=False) if dm_password is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") try: options._update_loose(read_cache(dm_password)) except Exception, e: @@ -886,7 +886,7 @@ def main(): dm_password = read_dm_password() if dm_password is None: - sys.exit("\nDirectory Manager password required") + sys.exit("Directory Manager password required") else: dm_password = options.dm_password @@ -898,7 +898,7 @@ def main(): if not options.admin_password: admin_password = read_admin_password() if admin_password is None: - sys.exit("\nIPA admin password required") + sys.exit("IPA admin password required") else: admin_password = options.admin_password diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 5d6ff10..a024100 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -293,7 +293,8 @@ def read_password(user, confirm=True, validate=True, retry=True, validator=_read correct = True except EOFError: return None - print "" + finally: + print "" return pwd def update_file(filename, orig, subst):