diff --git a/lib/ansible/modules/files/unarchive.py b/lib/ansible/modules/files/unarchive.py index d5df63a8de..251fbab35e 100644 --- a/lib/ansible/modules/files/unarchive.py +++ b/lib/ansible/modules/files/unarchive.py @@ -257,18 +257,18 @@ def main(): module = AnsibleModule( # not checking because of daisy chain to file module argument_spec = dict( - src = dict(required=True), - original_basename = dict(required=False), # used to handle 'dest is a directory' via template, a slight hack - dest = dict(required=True), + src = dict(required=True, type='path'), + original_basename = dict(required=False, type='str'), # used to handle 'dest is a directory' via template, a slight hack + dest = dict(required=True, type='path'), copy = dict(default=True, type='bool'), - creates = dict(required=False), + creates = dict(required=False, type='path'), list_files = dict(required=False, default=False, type='bool'), ), 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'] copy = module.params['copy'] file_args = module.load_file_common_arguments(module.params) diff --git a/lib/ansible/modules/web_infrastructure/supervisorctl.py b/lib/ansible/modules/web_infrastructure/supervisorctl.py index 4da81ed6e0..087cb113d6 100644 --- a/lib/ansible/modules/web_infrastructure/supervisorctl.py +++ b/lib/ansible/modules/web_infrastructure/supervisorctl.py @@ -98,11 +98,11 @@ EXAMPLES = ''' def main(): arg_spec = dict( name=dict(required=True), - config=dict(required=False), + config=dict(required=False, type='path'), server_url=dict(required=False), username=dict(required=False), password=dict(required=False), - supervisorctl_path=dict(required=False), + supervisorctl_path=dict(required=False, type='path'), state=dict(required=True, choices=['present', 'started', 'restarted', 'stopped', 'absent']) ) @@ -121,7 +121,6 @@ def main(): supervisorctl_path = module.params.get('supervisorctl_path') if supervisorctl_path: - supervisorctl_path = os.path.expanduser(supervisorctl_path) if os.path.exists(supervisorctl_path) and is_executable(supervisorctl_path): supervisorctl_args = [supervisorctl_path] else: @@ -131,7 +130,7 @@ def main(): supervisorctl_args = [module.get_bin_path('supervisorctl', True)] if config: - supervisorctl_args.extend(['-c', os.path.expanduser(config)]) + supervisorctl_args.extend(['-c', config]) if server_url: supervisorctl_args.extend(['-s', server_url]) if username: