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

Fix copy when force=no and update _remote_md5 docs.

Browse source 
Previously setting force=no caused copy to subversively
fail when target did not exist on remote host.

Caused by Runner._remote_md5 returning 1
when files don't exist, rather than 0.
This commit is contained in:
Jeremiah Heller 2013-05-23 14:55:41 -07:00 committed by Michael DeHaan
parent 3e774fedea
commit 7de718cd51
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/runner/__init__.py
View file

@ -621,7 +621,7 @@ class Runner(object):
# *****************************************************
def _remote_md5(self, conn, tmp, path):
''' takes a remote md5sum without requiring python, and returns 0 if no file '''
''' takes a remote md5sum without requiring python, and returns 1 if no file '''
path = pipes.quote(path)
# The following test needs to be SH-compliant. BASH-isms will

4
lib/ansible/runner/action_plugins/copy.py
View file

@ -106,8 +106,8 @@ class ActionModule(object):
dest = os.path.join(dest, os.path.basename(source))
remote_md5 = self.runner._remote_md5(conn, tmp, dest)
# remote_md5 == '0' would mean that the file does not exist.
if remote_md5 != '0' and not force:
# remote_md5 == '1' would mean that the file does not exist.
if remote_md5 != '1' and not force:
return ReturnData(conn=conn, result=dict(changed=False))
exec_rc = None