mirror of https://github.com/kewlfft/ansible-aur
Add use_args option
parent
43f8736f76
commit
6cc320a5e2
|
@ -42,6 +42,14 @@ options:
|
||||||
default: auto
|
default: auto
|
||||||
choices: [ auto, yay, pacaur, trizen, pikaur, aurman, makepkg ]
|
choices: [ auto, yay, pacaur, trizen, pikaur, aurman, makepkg ]
|
||||||
|
|
||||||
|
use_args:
|
||||||
|
description:
|
||||||
|
- Arguments to pass to the helper.
|
||||||
|
Requires that the 'use' option be set to something other than 'auto'.
|
||||||
|
type: list
|
||||||
|
elements: str
|
||||||
|
default: []
|
||||||
|
|
||||||
skip_pgp_check:
|
skip_pgp_check:
|
||||||
description:
|
description:
|
||||||
- Only valid with makepkg.
|
- Only valid with makepkg.
|
||||||
|
@ -158,23 +166,24 @@ def install_with_makepkg(module, package):
|
||||||
return (rc, out, err)
|
return (rc, out, err)
|
||||||
|
|
||||||
|
|
||||||
def build_command_prefix(use, aur_only):
|
def build_command_prefix(use, use_args, aur_only):
|
||||||
"""
|
"""
|
||||||
Create the prefix of a command that can be used by the install and upgrade functions.
|
Create the prefix of a command that can be used by the install and upgrade functions.
|
||||||
"""
|
"""
|
||||||
command = def_lang + use_cmd[use]
|
command = def_lang + use_cmd[use]
|
||||||
if (aur_only and use in has_aur_option):
|
if (aur_only and use in has_aur_option):
|
||||||
command.append('--aur')
|
command.append('--aur')
|
||||||
|
command += use_args
|
||||||
return command
|
return command
|
||||||
|
|
||||||
|
|
||||||
def upgrade(module, use, aur_only):
|
def upgrade(module, use, use_args, aur_only):
|
||||||
"""
|
"""
|
||||||
Upgrade the whole system
|
Upgrade the whole system
|
||||||
"""
|
"""
|
||||||
assert use in use_cmd
|
assert use in use_cmd
|
||||||
|
|
||||||
command = build_command_prefix(use, aur_only)
|
command = build_command_prefix(use, use_args, aur_only)
|
||||||
command.append('-u')
|
command.append('-u')
|
||||||
|
|
||||||
rc, out, err = module.run_command(command, check_rc=True)
|
rc, out, err = module.run_command(command, check_rc=True)
|
||||||
|
@ -186,7 +195,7 @@ def upgrade(module, use, aur_only):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def install_packages(module, packages, use, state, aur_only):
|
def install_packages(module, packages, use, use_args, state, aur_only):
|
||||||
"""
|
"""
|
||||||
Install the specified packages
|
Install the specified packages
|
||||||
"""
|
"""
|
||||||
|
@ -202,7 +211,7 @@ def install_packages(module, packages, use, state, aur_only):
|
||||||
if use == 'makepkg':
|
if use == 'makepkg':
|
||||||
rc, out, err = install_with_makepkg(module, package)
|
rc, out, err = install_with_makepkg(module, package)
|
||||||
else:
|
else:
|
||||||
command = build_command_prefix(use, aur_only)
|
command = build_command_prefix(use, use_args, aur_only)
|
||||||
command.append(package)
|
command.append(package)
|
||||||
rc, out, err = module.run_command(command, check_rc=True)
|
rc, out, err = module.run_command(command, check_rc=True)
|
||||||
|
|
||||||
|
@ -235,6 +244,11 @@ def make_module():
|
||||||
'default': 'auto',
|
'default': 'auto',
|
||||||
'choices': ['auto'] + list(use_cmd.keys()),
|
'choices': ['auto'] + list(use_cmd.keys()),
|
||||||
},
|
},
|
||||||
|
'use_args': {
|
||||||
|
'type': 'list',
|
||||||
|
'elements': 'str',
|
||||||
|
'default': [],
|
||||||
|
},
|
||||||
'skip_pgp_check': {
|
'skip_pgp_check': {
|
||||||
'default': False,
|
'default': False,
|
||||||
'type': 'bool',
|
'type': 'bool',
|
||||||
|
@ -250,12 +264,15 @@ def make_module():
|
||||||
},
|
},
|
||||||
mutually_exclusive=[['name', 'upgrade']],
|
mutually_exclusive=[['name', 'upgrade']],
|
||||||
required_one_of=[['name', 'upgrade']],
|
required_one_of=[['name', 'upgrade']],
|
||||||
required_by={'use': ['skip_pgp_check', 'ignore_arch']},
|
required_by={'use': ['use_args', 'skip_pgp_check', 'ignore_arch']},
|
||||||
supports_check_mode=True
|
supports_check_mode=True
|
||||||
)
|
)
|
||||||
|
|
||||||
params = module.params
|
params = module.params
|
||||||
|
|
||||||
|
if params['use'] == 'auto' and params['use_args']:
|
||||||
|
module.fail_json(msg="You must specify a helper other than 'auto' to use the 'use_flags' option.")
|
||||||
|
|
||||||
if params['use'] != 'makepkg' and params['skip_pgp_check']:
|
if params['use'] != 'makepkg' and params['skip_pgp_check']:
|
||||||
module.fail_json(msg="You must use 'makepkg' to use the 'skip_pgp_check' option.")
|
module.fail_json(msg="You must use 'makepkg' to use the 'skip_pgp_check' option.")
|
||||||
if params['use'] != 'makepkg' and params['ignore_arch']:
|
if params['use'] != 'makepkg' and params['ignore_arch']:
|
||||||
|
@ -283,9 +300,9 @@ def apply_module(module, use):
|
||||||
if module.check_mode:
|
if module.check_mode:
|
||||||
check_packages(module, params['name'])
|
check_packages(module, params['name'])
|
||||||
elif params.get('upgrade', False):
|
elif params.get('upgrade', False):
|
||||||
upgrade(module, use, params['aur_only'])
|
upgrade(module, use, params['use_args'], params['aur_only'])
|
||||||
else:
|
else:
|
||||||
install_packages(module, params['name'], use, params['state'], params['aur_only'])
|
install_packages(module, params['name'], use, params['use_args'], params['state'], params['aur_only'])
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
Loading…
Reference in New Issue