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

And remove the expanduser calls from the action_plugin

Browse source
This commit is contained in:
James Cammarata 2014-02-26 15:29:00 -06:00
parent 32a2636dc7
commit 2a383786dd
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,15 +61,10 @@ class ActionModule(object):
result=dict(failed=True, msg="src and content are mutually exclusive")
return ReturnData(conn=conn, result=result)
# Check if the source ends with a "/" and
# expand any tildes that may be in the path
# Check if the source ends with a "/"
source_trailing_slash = False
if source:
source_trailing_slash = source.endswith("/")
source = os.path.expanduser(source)
# And expand the path for the destination
if dest:
dest = os.path.expanduser(dest)
# Define content_tempfile in case we set it after finding content populated.
content_tempfile = None