cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

More path encoding fixes.

Browse source
This commit is contained in:
Matt Clay 2019-01-16 14:15:10 -08:00
parent 0f846f39ca
commit b971ebd343
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/parsing/vault/__init__.py
View file

@ -737,7 +737,7 @@ class VaultLib:
file_slug = ''
if filename:
file_slug = ' of "%s"' % filename
display.vvvvv('Decrypt%s successful with secret=%s and vault_id=%s' % (file_slug, vault_secret, vault_secret_id))
display.vvvvv('Decrypt%s successful with secret=%s and vault_id=%s' % (to_text(file_slug), vault_secret, vault_secret_id))
break
except AnsibleVaultFormatError as exc:
msg = "There was a vault format error"

2
lib/ansible/plugins/action/__init__.py
View file

@ -981,7 +981,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
# Change directory to basedir of task for command execution when connection is local
if self._connection.transport == 'local':
cwd = os.getcwd()
os.chdir(self._loader.get_basedir())
os.chdir(to_bytes(self._loader.get_basedir()))
try:
rc, stdout, stderr = self._connection.exec_command(cmd, in_data=in_data, sudoable=sudoable)
finally: