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

cleaner error on recursive remote copy

Browse source 
TODO: add recursive copy support when remote_src=yes
probably need to make shared the logic in the action plugin.
This commit is contained in:
Brian Coca 2016-02-12 22:36:57 -05:00 committed by Matt Clay
parent 06e3899860
commit 23c07ccf2c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/files/copy.py
View file

@ -232,9 +232,11 @@ def main():
remote_src = module.params['remote_src']
if not os.path.exists(src):
module.fail_json(msg="Source %s failed to transfer" % (src))
module.fail_json(msg="Source %s not found" % (src))
if not os.access(src, os.R_OK):
module.fail_json(msg="Source %s not readable" % (src))
if os.path.isdir(src):
module.fail_json(msg="Remote copy does not support recurisive copy of direcory: %s" % (src))
checksum_src = module.sha1(src)
checksum_dest = None
@ -316,7 +318,7 @@ def main():
else:
module.atomic_move(src, dest)
except IOError:
module.fail_json(msg="failed to copy: %s to %s" % (src, dest))
module.fail_json(msg="failed to copy: %s to %s" % (src, dest), traceback=traceback.format_exc())
changed = True
else:
changed = False