Repository: ambari Updated Branches: refs/heads/trunk 7cd4d454a -> bde50b34b
AMBARI-6984. Change prompt to Ambari Admin. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bde50b34 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bde50b34 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bde50b34 Branch: refs/heads/trunk Commit: bde50b34b5cd26a98780092237646378f75877c1 Parents: 7cd4d45 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Fri Oct 3 11:14:50 2014 -0700 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Fri Oct 3 11:14:50 2014 -0700 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari-server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bde50b34/ambari-server/src/main/python/ambari-server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py index 0906e71..080b4ad 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -3057,10 +3057,10 @@ def sync_ldap(): err = "LDAP is not configured. Run 'ambari-server setup-ldap' first." raise FatalException(1, err) - admin_login = get_validated_string_input(prompt="Enter admin login: ", default=None, + admin_login = get_validated_string_input(prompt="Enter Ambari Admin login: ", default=None, pattern=None, description=None, is_pass=False, allowEmpty=False) - admin_password = get_validated_string_input(prompt="Enter admin password: ", default=None, + admin_password = get_validated_string_input(prompt="Enter Ambari Admin password: ", default=None, pattern=None, description=None, is_pass=True, allowEmpty=False) @@ -3169,7 +3169,7 @@ def get_ldap_event_spec_names(file, specs, new_specs): else: err = 'Sync event creation failed. File ' + file + ' not found.' raise FatalException(1, err) - except: + except Exception as exception: err = 'Caught exception reading file ' + file + ' : ' + str(exception) raise FatalException(1, err)
