mirrors
/
ansible-aur
mirror of https://github.com/kewlfft/ansible-aur
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

combine auto tests

pull/43/head v0.40
kewl fft 2020-05-31 19:56:33 -04:00
parent a470eed6e1
commit 5aebeda3d4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/aur.py
View File

@ -272,18 +272,17 @@ def make_module():
params = module.params params = module.params
if params['use'] == 'auto' and params['extra_args'] is not None: use = params['use']
module.fail_json(msg="'extra_args' option cannot be used with 'auto', a tool must be specified.")
if params['use'] == 'auto': if use == 'auto':
if params['extra_args'] is not None:
module.fail_json(msg="'extra_args' cannot be used with 'auto', a tool must be specified.")
use = 'makepkg' use = 'makepkg'
# auto: select the first helper for which the bin is found # auto: select the first helper for which the bin is found
for k in use_cmd: for k in use_cmd:
if module.get_bin_path(k): if module.get_bin_path(k):
use = k use = k
break break
else:
use = params['use']
if use != 'makepkg' and (params['skip_pgp_check'] or params['ignore_arch']): if use != 'makepkg' and (params['skip_pgp_check'] or params['ignore_arch']):
module.fail_json(msg="This option is only available with 'makepkg'.") module.fail_json(msg="This option is only available with 'makepkg'.")