diff options
| author | James Tanner <tanner.jc@gmail.com> | 2014-03-19 19:36:52 +0100 |
|---|---|---|
| committer | James Tanner <tanner.jc@gmail.com> | 2014-03-19 19:38:11 +0100 |
| commit | 409044155d2b6df49f63cc24d347e8cd715fe6a5 (patch) | |
| tree | 2df008c517a69ded8550edea51b4847a07643c0b /bin/ansible-playbook | |
| parent | Merge pull request #6575 from mahemoff/devel (diff) | |
| download | ansible-409044155d2b6df49f63cc24d347e8cd715fe6a5.tar.xz ansible-409044155d2b6df49f63cc24d347e8cd715fe6a5.zip | |
Fixes #6579 allow for vault passwords ending with newline chars
Also add a unit test for vaulteditor to verify 1.0 passwords with newline chars.
Diffstat (limited to 'bin/ansible-playbook')
| -rwxr-xr-x | bin/ansible-playbook | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/bin/ansible-playbook b/bin/ansible-playbook index be178a6565..344590341e 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -127,9 +127,6 @@ def main(args): except (OSError, IOError), e: raise errors.AnsibleError("Could not read %s: %s" % (this_path, e)) - # get rid of newline chars - tmp_vault_pass = tmp_vault_pass.strip() - if not options.ask_vault_pass: vault_pass = tmp_vault_pass |