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

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

Browse source
This commit is contained in:
James Cammarata 2014-02-26 12:28:26 -06:00
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:
options.update(complex_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)
dest = options.get('dest', None)
dest = os.path.expanduser(options.get('dest', None))
raw = utils.boolean(options.get('raw', 'no'))
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:
options.update(complex_args)
options.update(utils.parse_kv(module_args))
source = options.get('src', None)
dest = options.get('dest', None)
source = os.path.expanduser(options.get('src', None))
dest = os.path.expanduser(options.get('dest', None))
copy = utils.boolean(options.get('copy', 'yes'))
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,
)
src = os.path.expanduser(module.params['src'])
dest = os.path.expanduser(module.params['dest'])
src = module.params['src']
dest = module.params['dest']
backup = module.params['backup']
force = module.params['force']
original_basename = module.params.get('original_basename',None)