From b3e47d6395d27764f58196769fb296fb114f4bf2 Mon Sep 17 00:00:00 2001 From: Assaf Sapir Date: Tue, 19 Oct 2021 20:48:51 +0300 Subject: [PATCH 1/5] Add support for refresh package --- plugins/modules/aur.py | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/plugins/modules/aur.py b/plugins/modules/aur.py index db78736..9c97c04 100644 --- a/plugins/modules/aur.py +++ b/plugins/modules/aur.py @@ -39,6 +39,12 @@ options: default: no type: bool + refresh: + description: + - Whether or not to refresh the package cache. + default: no + type: bool + use: description: - The tool to use, 'auto' uses the first known helper found and makepkg as a fallback. @@ -160,7 +166,7 @@ def check_packages(module, packages): module.exit_json(changed=status, msg=message, diff=diff) -def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=False, aur_only=False, local_pkgbuild=None): +def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=False, aur_only=False, local_pkgbuild=None, refresh=False): """ Create the prefix of a command that can be used by the install and upgrade functions. """ @@ -176,6 +182,8 @@ def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=Fals command.append('--aur') if local_pkgbuild and use != 'makepkg': command.append(local_pkgbuild) + if refresh: + command.append('--y') if extra_args: command += shlex.split(extra_args) return command @@ -232,13 +240,13 @@ def check_upgrade(module, use): ) -def upgrade(module, use, extra_args, aur_only): +def upgrade(module, use, extra_args, aur_only, refresh): """ Upgrade the whole system """ assert use in use_cmd - command = build_command_prefix(use, extra_args, aur_only=aur_only) + command = build_command_prefix(use, extra_args, aur_only=aur_only, refresh=refresh) command.append('-u') rc, out, err = module.run_command(command, check_rc=True) @@ -250,7 +258,7 @@ def upgrade(module, use, extra_args, aur_only): ) -def install_packages(module, packages, use, extra_args, state, skip_pgp_check, ignore_arch, aur_only, local_pkgbuild): +def install_packages(module, packages, use, extra_args, state, skip_pgp_check, ignore_arch, aur_only, local_pkgbuild, refresh): """ Install the specified packages """ @@ -271,7 +279,7 @@ def install_packages(module, packages, use, extra_args, state, skip_pgp_check, i elif local_pkgbuild: rc, out, err = install_local_package(module, package, use, extra_args, local_pkgbuild) else: - command = build_command_prefix(use, extra_args, aur_only=aur_only) + command = build_command_prefix(use, extra_args, aur_only=aur_only, refresh=refresh) command.append(package) rc, out, err = module.run_command(command, check_rc=True) @@ -300,6 +308,10 @@ def make_module(): 'upgrade': { 'type': 'bool', }, + 'refresh': { + 'default': False, + 'type': 'bool', + }, 'use': { 'default': 'auto', 'choices': ['auto'] + list(use_cmd.keys()), @@ -385,7 +397,8 @@ def apply_module(module, use): params['skip_pgp_check'], params['ignore_arch'], params['aur_only'], - params['local_pkgbuild']) + params['local_pkgbuild'], + params['refresh']) def main(): From 472a92ff8ea9e7f162df7fd9321e39fc5eac2d66 Mon Sep 17 00:00:00 2001 From: Assaf Sapir Date: Tue, 19 Oct 2021 20:59:14 +0300 Subject: [PATCH 2/5] fix bug and update version --- galaxy.yml | 3 +-- plugins/modules/aur.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index 81c3fd2..105b933 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -8,7 +8,7 @@ namespace: kewlfft name: aur # The version of the collection. Must be compatible with semantic versioning -version: 0.9.1 +version: 0.10.0 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md @@ -66,4 +66,3 @@ issues: https://github.com/kewlfft/ansible-aur/issues # uses 'fnmatch' to match the files or directories. Some directories and files like 'galaxy.yml', '*.pyc', '*.retry', # and '.git' are always filtered build_ignore: [] - diff --git a/plugins/modules/aur.py b/plugins/modules/aur.py index 9c97c04..fe569fe 100644 --- a/plugins/modules/aur.py +++ b/plugins/modules/aur.py @@ -384,7 +384,7 @@ def apply_module(module, use): if module.check_mode: check_upgrade(module, use) else: - upgrade(module, use, params['extra_args'], params['aur_only']) + upgrade(module, use, params['extra_args'], params['aur_only'], params['refresh']) else: if module.check_mode: check_packages(module, params['name']) From e8108fe3e472a965e6ce97b83dadc04a59ccc489 Mon Sep 17 00:00:00 2001 From: Assaf Sapir Date: Thu, 21 Oct 2021 19:44:02 +0300 Subject: [PATCH 3/5] Fix parameter --- README.md | 1 + plugins/modules/aur.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a59bcad..1549dbf 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ The following helpers are supported and automatically selected, if present, in t | name | | Name or list of names of the package(s) to install or upgrade. | | state | **present**, latest | Desired state of the package, 'present' skips operations if the package is already installed. | | upgrade | yes, **no** | Whether or not to upgrade whole system. | +| refresh | yes, **no** | Whether or not to refresh the packages cache | | use | **auto**, yay, paru, pacaur, trizen, pikaur, aurman, makepkg | The tool to use, 'auto' uses the first known helper found and makepkg as a fallback. | | extra_args | **null** | A list of additional arguments to pass directly to the tool. Cannot be used in 'auto' mode. | | aur_only | yes, **no** | Limit helper operation to the AUR. | diff --git a/plugins/modules/aur.py b/plugins/modules/aur.py index fe569fe..d35deb5 100644 --- a/plugins/modules/aur.py +++ b/plugins/modules/aur.py @@ -183,7 +183,7 @@ def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=Fals if local_pkgbuild and use != 'makepkg': command.append(local_pkgbuild) if refresh: - command.append('--y') + command.append('--refresh') if extra_args: command += shlex.split(extra_args) return command @@ -247,7 +247,7 @@ def upgrade(module, use, extra_args, aur_only, refresh): assert use in use_cmd command = build_command_prefix(use, extra_args, aur_only=aur_only, refresh=refresh) - command.append('-u') + command.append('--upgrade') rc, out, err = module.run_command(command, check_rc=True) From f12cb1b36ba938724893de55e8cfb6715ddff2ac Mon Sep 17 00:00:00 2001 From: Assaf Sapir Date: Thu, 21 Oct 2021 19:49:24 +0300 Subject: [PATCH 4/5] Fix parameter --- plugins/modules/aur.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/modules/aur.py b/plugins/modules/aur.py index d35deb5..5adefef 100644 --- a/plugins/modules/aur.py +++ b/plugins/modules/aur.py @@ -183,7 +183,7 @@ def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=Fals if local_pkgbuild and use != 'makepkg': command.append(local_pkgbuild) if refresh: - command.append('--refresh') + command.append('-y') if extra_args: command += shlex.split(extra_args) return command @@ -247,7 +247,7 @@ def upgrade(module, use, extra_args, aur_only, refresh): assert use in use_cmd command = build_command_prefix(use, extra_args, aur_only=aur_only, refresh=refresh) - command.append('--upgrade') + command.append('-u') rc, out, err = module.run_command(command, check_rc=True) From 2319468c2e3fb68e8c70b7536fa79651c016627a Mon Sep 17 00:00:00 2001 From: Assaf Sapir Date: Fri, 22 Oct 2021 12:23:07 +0300 Subject: [PATCH 5/5] use update_cache --- README.md | 2 +- plugins/modules/aur.py | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1549dbf..14a7419 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ The following helpers are supported and automatically selected, if present, in t | name | | Name or list of names of the package(s) to install or upgrade. | | state | **present**, latest | Desired state of the package, 'present' skips operations if the package is already installed. | | upgrade | yes, **no** | Whether or not to upgrade whole system. | -| refresh | yes, **no** | Whether or not to refresh the packages cache | +| update_cache | yes, **no** | Whether or not to refresh the packages cache | | use | **auto**, yay, paru, pacaur, trizen, pikaur, aurman, makepkg | The tool to use, 'auto' uses the first known helper found and makepkg as a fallback. | | extra_args | **null** | A list of additional arguments to pass directly to the tool. Cannot be used in 'auto' mode. | | aur_only | yes, **no** | Limit helper operation to the AUR. | diff --git a/plugins/modules/aur.py b/plugins/modules/aur.py index 5adefef..50284cc 100644 --- a/plugins/modules/aur.py +++ b/plugins/modules/aur.py @@ -39,9 +39,9 @@ options: default: no type: bool - refresh: + update_cache: description: - - Whether or not to refresh the package cache. + - Whether or not to update_cache the package cache. default: no type: bool @@ -166,7 +166,7 @@ def check_packages(module, packages): module.exit_json(changed=status, msg=message, diff=diff) -def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=False, aur_only=False, local_pkgbuild=None, refresh=False): +def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=False, aur_only=False, local_pkgbuild=None, update_cache=False): """ Create the prefix of a command that can be used by the install and upgrade functions. """ @@ -182,7 +182,7 @@ def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=Fals command.append('--aur') if local_pkgbuild and use != 'makepkg': command.append(local_pkgbuild) - if refresh: + if update_cache: command.append('-y') if extra_args: command += shlex.split(extra_args) @@ -240,13 +240,13 @@ def check_upgrade(module, use): ) -def upgrade(module, use, extra_args, aur_only, refresh): +def upgrade(module, use, extra_args, aur_only, update_cache): """ Upgrade the whole system """ assert use in use_cmd - command = build_command_prefix(use, extra_args, aur_only=aur_only, refresh=refresh) + command = build_command_prefix(use, extra_args, aur_only=aur_only, update_cache=update_cache) command.append('-u') rc, out, err = module.run_command(command, check_rc=True) @@ -258,7 +258,7 @@ def upgrade(module, use, extra_args, aur_only, refresh): ) -def install_packages(module, packages, use, extra_args, state, skip_pgp_check, ignore_arch, aur_only, local_pkgbuild, refresh): +def install_packages(module, packages, use, extra_args, state, skip_pgp_check, ignore_arch, aur_only, local_pkgbuild, update_cache): """ Install the specified packages """ @@ -279,7 +279,7 @@ def install_packages(module, packages, use, extra_args, state, skip_pgp_check, i elif local_pkgbuild: rc, out, err = install_local_package(module, package, use, extra_args, local_pkgbuild) else: - command = build_command_prefix(use, extra_args, aur_only=aur_only, refresh=refresh) + command = build_command_prefix(use, extra_args, aur_only=aur_only, update_cache=update_cache) command.append(package) rc, out, err = module.run_command(command, check_rc=True) @@ -308,7 +308,7 @@ def make_module(): 'upgrade': { 'type': 'bool', }, - 'refresh': { + 'update_cache': { 'default': False, 'type': 'bool', }, @@ -384,7 +384,7 @@ def apply_module(module, use): if module.check_mode: check_upgrade(module, use) else: - upgrade(module, use, params['extra_args'], params['aur_only'], params['refresh']) + upgrade(module, use, params['extra_args'], params['aur_only'], params['update_cache']) else: if module.check_mode: check_packages(module, params['name']) @@ -398,7 +398,7 @@ def apply_module(module, use): params['ignore_arch'], params['aur_only'], params['local_pkgbuild'], - params['refresh']) + params['update_cache']) def main():