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

Move where the expanduser call is made, to avoid issues with None

Browse source
This commit is contained in:
James Cammarata 2014-02-26 12:33:17 -06:00
parent e659d55d62
commit 96f1c3ce2e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,9 +48,9 @@ class ActionModule(object):
if complex_args:
options.update(complex_args)
options.update(utils.parse_kv(module_args))
source = os.path.expanduser(options.get('src', None))
source = options.get('src', None)
content = options.get('content', None)
dest = os.path.expanduser(options.get('dest', None))
dest = options.get('dest', None)
raw = utils.boolean(options.get('raw', 'no'))
force = utils.boolean(options.get('force', 'yes'))
@ -61,10 +61,15 @@ 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 "/"
# Check if the source ends with a "/" and
# expand any tildes that may be in the path
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