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

Properly fail if slurp fails during fetch

Browse source
This commit is contained in:
James Cammarata 2015-08-31 16:45:03 -04:00
parent 66a2f2923e
commit fca27c29f4
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/plugins/action/fetch.py
View file

@ -61,7 +61,9 @@ class ActionModule(ActionBase):
remote_data = None
if remote_checksum in ('1', '2') or self._play_context.become:
slurpres = self._execute_module(module_name='slurp', module_args=dict(src=source), task_vars=task_vars, tmp=tmp)
if not slurpres.get('failed', False):
if slurpres.get('failed'):
return slurpres
else:
if slurpres['encoding'] == 'base64':
remote_data = base64.b64decode(slurpres['content'])
if remote_data is not None:
@ -72,9 +74,6 @@ class ActionModule(ActionBase):
remote_source = slurpres.get('source')
if remote_source and remote_source != source:
source = remote_source
else:
# FIXME: should raise an error here? the old code did nothing
pass
# calculate the destination name
if os.path.sep not in self._connection._shell.join_path('a', ''):