Addresses #6579 Only strip vault passwords if given

pull/6572/merge
James Tanner 11 years ago
parent 8c2e1e2baa
commit e71857fbdf

@ -811,7 +811,9 @@ def ask_vault_passwords(ask_vault_pass=False, ask_new_vault_pass=False, confirm_
raise errors.AnsibleError("Passwords do not match") raise errors.AnsibleError("Passwords do not match")
# enforce no newline chars at the end of passwords # enforce no newline chars at the end of passwords
if vault_pass:
vault_pass = vault_pass.strip() vault_pass = vault_pass.strip()
if new_vault_pass:
new_vault_pass = new_vault_pass.strip() new_vault_pass = new_vault_pass.strip()
return vault_pass, new_vault_pass return vault_pass, new_vault_pass

Loading…
Cancel
Save