ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Port arg specs from type='str' to type='path'

Browse source
This commit is contained in:
Toshio Kuratomi 2017-10-07 14:57:13 -07:00
parent dc69af50dc
commit 75eed6a51a
12 changed files with 27 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/web_infrastructure/django_manage.py
View file

@ -148,7 +148,7 @@ def _ensure_virtualenv(module):
if venv_param is None:
return
vbin = os.path.join(os.path.expanduser(venv_param), 'bin')
vbin = os.path.join(venv_param, 'bin')
activate = os.path.join(vbin, 'activate')
if not os.path.exists(activate):
@ -224,10 +224,10 @@ def main():
module = AnsibleModule(
argument_spec=dict(
command=dict(default=None, required=True),
app_path=dict(default=None, required=True),
app_path=dict(default=None, required=True, type='path'),
settings=dict(default=None, required=False),
pythonpath=dict(default=None, required=False, aliases=['python_path']),
virtualenv=dict(default=None, required=False, aliases=['virtual_env']),
virtualenv=dict(default=None, required=False, type='path', aliases=['virtual_env']),
apps=dict(default=None, required=False),
cache_table=dict(default=None, required=False),
@ -244,7 +244,7 @@ def main():
)
command = module.params['command']
app_path = os.path.expanduser(module.params['app_path'])
app_path = module.params['app_path']
virtualenv = module.params['virtualenv']
for param in specific_params:
@ -278,7 +278,7 @@ def main():
if module.params[param]:
cmd = '%s %s' % (cmd, module.params[param])
rc, out, err = module.run_command(cmd, cwd=os.path.expanduser(app_path))
rc, out, err = module.run_command(cmd, cwd=app_path)
if rc != 0:
if command == 'createcachetable' and 'table' in err and 'already exists' in err:
out = 'Already exists.'