a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/4420/head
James Cammarata 2014-02-26 12:28:26 -06:00
parent 5ff20c1ae7 b0f00cc097
commit e659d55d62
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'))

4
lib/ansible/runner/action_plugins/unarchive.py
View File

@ -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:

4
library/files/copy
View File

@ -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)