From 583c7597a90a7fae4b71360a8b71beff645509c0 Mon Sep 17 00:00:00 2001 From: kewl fft Date: Sat, 8 Jul 2023 19:20:32 +0100 Subject: [PATCH] minor optimizations --- plugins/modules/aur.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/plugins/modules/aur.py b/plugins/modules/aur.py index 87cc0ae..049955f 100644 --- a/plugins/modules/aur.py +++ b/plugins/modules/aur.py @@ -221,11 +221,10 @@ def check_upgrade(module, use): Inform user how many packages would be upgraded """ rc, stdout, stderr = module.run_command([use, '-Qu'], check_rc=True) - data = stdout.split('\n') - data.remove('') + num_packages = sum(1 for line in stdout.splitlines() if line.strip()) module.exit_json( - changed=len(data) > 0, - msg="{} package(s) would be upgraded".format(len(data)), + changed=num_packages > 0, + msg=f"{num_packages} package(s) would be upgraded", helper=use, ) @@ -260,10 +259,9 @@ def install_packages(module, packages, use, extra_args, state, skip_pgp_check, i changed_iter = False for package in packages: - if state == 'present': - if package_installed(module, package): - rc = 0 - continue + if state == 'present' and package_installed(module, package): + rc = 0 + continue if use == 'makepkg': rc, out, err = install_with_makepkg(module, package, extra_args, skip_pgp_check, ignore_arch, local_pkgbuild) elif local_pkgbuild: