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

Merge branch 'issue_4215_fetch_expanduser' into devel

Browse source
This commit is contained in:
James Cammarata 2013-10-07 08:27:52 -05:00
commit d10582225b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/runner/action_plugins/fetch.py
View file

@ -56,6 +56,8 @@ class ActionModule(object):
results = dict(failed=True, msg="src and dest are required") results = dict(failed=True, msg="src and dest are required")
return ReturnData(conn=conn, result=results) return ReturnData(conn=conn, result=results)
source = os.path.expanduser(source)
if flat: if flat:
if dest.endswith("/"): if dest.endswith("/"):
# if the path ends with "/", we'll use the source filename as the # if the path ends with "/", we'll use the source filename as the
@ -68,7 +70,8 @@ class ActionModule(object):
else: else:
# files are saved in dest dir, with a subdir for each host, then the filename # files are saved in dest dir, with a subdir for each host, then the filename
dest = "%s/%s/%s" % (utils.path_dwim(self.runner.basedir, dest), conn.host, source) dest = "%s/%s/%s" % (utils.path_dwim(self.runner.basedir, dest), conn.host, source)
dest = dest.replace("//","/")
dest = os.path.expanduser(dest.replace("//","/"))
# calculate md5 sum for the remote file # calculate md5 sum for the remote file
remote_md5 = self.runner._remote_md5(conn, tmp, source) remote_md5 = self.runner._remote_md5(conn, tmp, source)