Addresses #6579 Only strip vault passwords if given

11 years ago · e71857fbdf
parent 8c2e1e2baa
commit e71857fbdf
1 changed files with 4 additions and 2 deletions
--- a/lib/ansible/utils/init.py
+++ b/lib/ansible/utils/init.py
@ -811,8 +811,10 @@ def ask_vault_passwords(ask_vault_pass=False, ask_new_vault_pass=False, confirm_
            raise errors.AnsibleError("Passwords do not match")

    # enforce no newline chars at the end of passwords
-    vault_pass = vault_pass.strip()
-    new_vault_pass = new_vault_pass.strip()
+    if vault_pass:
+        vault_pass = vault_pass.strip()
+    if new_vault_pass:
+        new_vault_pass = new_vault_pass.strip()

    return vault_pass, new_vault_pass