Commit e659d55d by James Cammarata

Merge branch 'devel' of https://github.com/muffl0n/ansible into muffl0n-devel

parents 5ff20c1a b0f00cc0
...@@ -48,9 +48,9 @@ class ActionModule(object): ...@@ -48,9 +48,9 @@ class ActionModule(object):
if complex_args: if complex_args:
options.update(complex_args) options.update(complex_args)
options.update(utils.parse_kv(module_args)) options.update(utils.parse_kv(module_args))
source = options.get('src', None) source = os.path.expanduser(options.get('src', None))
content = options.get('content', None) content = options.get('content', None)
dest = options.get('dest', None) dest = os.path.expanduser(options.get('dest', None))
raw = utils.boolean(options.get('raw', 'no')) raw = utils.boolean(options.get('raw', 'no'))
force = utils.boolean(options.get('force', 'yes')) force = utils.boolean(options.get('force', 'yes'))
......
...@@ -46,8 +46,8 @@ class ActionModule(object): ...@@ -46,8 +46,8 @@ class ActionModule(object):
if complex_args: if complex_args:
options.update(complex_args) options.update(complex_args)
options.update(utils.parse_kv(module_args)) options.update(utils.parse_kv(module_args))
source = options.get('src', None) source = os.path.expanduser(options.get('src', None))
dest = options.get('dest', None) dest = os.path.expanduser(options.get('dest', None))
copy = utils.boolean(options.get('copy', 'yes')) copy = utils.boolean(options.get('copy', 'yes'))
if source is None or dest is None: if source is None or dest is None:
......
...@@ -113,8 +113,8 @@ def main(): ...@@ -113,8 +113,8 @@ def main():
add_file_common_args=True, add_file_common_args=True,
) )
src = os.path.expanduser(module.params['src']) src = module.params['src']
dest = os.path.expanduser(module.params['dest']) dest = module.params['dest']
backup = module.params['backup'] backup = module.params['backup']
force = module.params['force'] force = module.params['force']
original_basename = module.params.get('original_basename',None) original_basename = module.params.get('original_basename',None)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment