wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6681 from zytek/devel

Browse source 
Properly revert changes introduced in #6579
This commit is contained in:
jctanner 2014-03-25 13:52:34 -04:00
commit adbd6865da
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/ansible
View file

@ -128,7 +128,7 @@ class Cli(object):
this_path = os.path.expanduser(options.vault_password_file) this_path = os.path.expanduser(options.vault_password_file)
try: try:
f = open(this_path, "rb") f = open(this_path, "rb")
tmp_vault_pass=f.read() tmp_vault_pass=f.read().strip()
f.close() f.close()
except (OSError, IOError), e: except (OSError, IOError), e:
raise errors.AnsibleError("Could not read %s: %s" % (this_path, e)) raise errors.AnsibleError("Could not read %s: %s" % (this_path, e))

2
bin/ansible-playbook
View file

@ -124,7 +124,7 @@ def main(args):
this_path = os.path.expanduser(options.vault_password_file) this_path = os.path.expanduser(options.vault_password_file)
try: try:
f = open(this_path, "rb") f = open(this_path, "rb")
tmp_vault_pass=f.read() tmp_vault_pass=f.read().strip()
f.close() f.close()
except (OSError, IOError), e: except (OSError, IOError), e:
raise errors.AnsibleError("Could not read %s: %s" % (this_path, e)) raise errors.AnsibleError("Could not read %s: %s" % (this_path, e))