AMBARI-2674. If the LDAP manager password is entered as a blank value on the first try, it will always be a blank. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/07effbf6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/07effbf6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/07effbf6 Branch: refs/heads/trunk Commit: 07effbf665120b19ef52d9a98c580f9d3fa25341 Parents: 2275602 Author: Siddharth Wagle <[email protected]> Authored: Wed Jul 17 09:56:26 2013 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Wed Jul 17 10:19:16 2013 -0700 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari-server.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/07effbf6/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 940c3af..5a63ee0 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -1001,14 +1001,16 @@ def read_password(passwordDefault=PG_DEFAULT_PASSWORD, if not password: print 'Password cannot be blank.' - read_password(passwordDefault, passwordPattern, passwordPrompt, passwordDescr) + return read_password(passwordDefault, passwordPattern, passwordPrompt, + passwordDescr) if password != passwordDefault: password1 = get_validated_string_input("Re-enter password: ", passwordDefault, passwordPattern, passwordDescr, True) if password != password1: print "Passwords do not match" - password = read_password(passwordDefault, passwordPattern, passwordPrompt, passwordDescr) + return read_password(passwordDefault, passwordPattern, passwordPrompt, + passwordDescr) return password
