Merge "read_password needs to store in .localrc.auto if local.conf is used."

This commit is contained in:
Jenkins 2014-02-11 17:07:53 +00:00 committed by Gerrit Code Review
commit 99ea3ad7c3

View File

@ -362,7 +362,11 @@ function read_password {
var=$1; msg=$2
pw=${!var}
localrc=$TOP_DIR/localrc
if [[ -f $RC_DIR/localrc ]]; then
localrc=$TOP_DIR/localrc
else
localrc=$TOP_DIR/.localrc.auto
fi
# If the password is not defined yet, proceed to prompt user for a password.
if [ ! $pw ]; then