aur_only param added

pull/19/head v0.22
kewl fft 2018-07-25 21:19:02 +01:00
parent 9772b680dd
commit 3901eb7368
2 changed files with 17 additions and 7 deletions

View File

@ -19,6 +19,7 @@ makepkg will be used if no helper was found or if it's specified explicitly.
|use |no |auto |auto, aurman, yay, pacaur, trizen, pikaur, makepkg |The helper to use, 'auto' uses the first known helper found and makepkg as a fallback.| |use |no |auto |auto, aurman, yay, pacaur, trizen, pikaur, makepkg |The helper to use, 'auto' uses the first known helper found and makepkg as a fallback.|
|skip_installed |no |no |yes, no |Skip operations if the package is present.| |skip_installed |no |no |yes, no |Skip operations if the package is present.|
|skip_pgp_check |no |no |yes, no |Skip verification of PGP signatures. This is useful when installing packages on a host without GnuPG (properly) configured. Only valid with makepkg.| |skip_pgp_check |no |no |yes, no |Skip verification of PGP signatures. This is useful when installing packages on a host without GnuPG (properly) configured. Only valid with makepkg.|
|aur_only |no |no |yes, no |Limit operation to the AUR. Compatible with yay, aurman, pacaur and trizen.|
### Note ### Note
* Either *name* or *upgrade* is required, both cannot be used together. * Either *name* or *upgrade* is required, both cannot be used together.

23
aur.py
View File

@ -49,6 +49,10 @@ options:
Only valid with makepkg. Only valid with makepkg.
type: bool type: bool
default: no default: no
aur_only:
description:
- Limit operation to the AUR. Compatible with yay, aurman, pacaur and trizen.
notes: notes:
- When used with a `loop:` each package will be processed individually, - When used with a `loop:` each package will be processed individually,
it is much more efficient to pass the list directly to the `name` option. it is much more efficient to pass the list directly to the `name` option.
@ -79,7 +83,8 @@ use_cmd = {
'pikaur': ['pikaur', '-S', '--noconfirm', '--noedit', '--needed'], 'pikaur': ['pikaur', '-S', '--noconfirm', '--noedit', '--needed'],
'makepkg': ['makepkg', '--syncdeps', '--install', '--noconfirm', '--needed'] 'makepkg': ['makepkg', '--syncdeps', '--install', '--noconfirm', '--needed']
} }
# optional: aurman, pacaur, trizen have a --aur option, do things only for aur
has_aur_option = ['yay', 'aurman', 'pacaur', 'trizen']
def package_installed(module, package): def package_installed(module, package):
@ -143,13 +148,13 @@ def install_with_makepkg(module, package):
return (rc, out, err) return (rc, out, err)
def upgrade(module, use): def upgrade(module, use, aur_only):
""" """
Upgrade the whole system Upgrade the whole system
""" """
assert use in use_cmd assert use in use_cmd
rc, out, err = module.run_command(def_lang + use_cmd[use] + ['-u'], check_rc=True) rc, out, err = module.run_command(def_lang + use_cmd[use] + ['--aur' if (aur_only and use in has_aur_option) else None] + ['-u'], check_rc=True)
module.exit_json( module.exit_json(
changed=not (out == '' or 'nothing to do' in out or 'No AUR updates found' in out), changed=not (out == '' or 'nothing to do' in out or 'No AUR updates found' in out),
@ -158,7 +163,7 @@ def upgrade(module, use):
) )
def install_packages(module, packages, use, skip_installed): def install_packages(module, packages, use, skip_installed, aur_only):
""" """
Install the specified packages Install the specified packages
""" """
@ -174,7 +179,7 @@ def install_packages(module, packages, use, skip_installed):
if use == 'makepkg': if use == 'makepkg':
rc, out, err = install_with_makepkg(module, package) rc, out, err = install_with_makepkg(module, package)
else: else:
rc, out, err = module.run_command(def_lang + use_cmd[use] + [package], check_rc=True) rc, out, err = module.run_command(def_lang + use_cmd[use] + ['--aur' if (aur_only and use in has_aur_option) else None] + [package], check_rc=True)
changed_iter = changed_iter or not (out == '' or '-- skipping' in out or 'nothing to do' in out) changed_iter = changed_iter or not (out == '' or '-- skipping' in out or 'nothing to do' in out)
@ -213,6 +218,10 @@ def main():
'default': False, 'default': False,
'type': 'bool', 'type': 'bool',
}, },
'aur_only': {
'default': False,
'type': 'bool',
},
}, },
required_one_of=[['name', 'upgrade']], required_one_of=[['name', 'upgrade']],
supports_check_mode=True supports_check_mode=True
@ -237,9 +246,9 @@ def main():
module.fail_json(msg="Upgrade cannot be used with this option.") module.fail_json(msg="Upgrade cannot be used with this option.")
else: else:
if params['upgrade']: if params['upgrade']:
upgrade(module, use) upgrade(module, use, params['aur_only'])
else: else:
install_packages(module, params['name'], use, params['skip_installed']) install_packages(module, params['name'], use, params['skip_installed'], params['aur_only'])
if __name__ == '__main__': if __name__ == '__main__':