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

minor optimizations

master v0.11.0
kewl fft 2023-07-08 19:20:32 +01:00
parent cbf843e1db
commit 583c7597a9
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/modules/aur.py
View File

@ -221,11 +221,10 @@ def check_upgrade(module, use):
Inform user how many packages would be upgraded Inform user how many packages would be upgraded
""" """
rc, stdout, stderr = module.run_command([use, '-Qu'], check_rc=True) rc, stdout, stderr = module.run_command([use, '-Qu'], check_rc=True)
data = stdout.split('\n') num_packages = sum(1 for line in stdout.splitlines() if line.strip())
data.remove('')
module.exit_json( module.exit_json(
changed=len(data) > 0, changed=num_packages > 0,
msg="{} package(s) would be upgraded".format(len(data)), msg=f"{num_packages} package(s) would be upgraded",
helper=use, helper=use,
) )
@ -260,10 +259,9 @@ def install_packages(module, packages, use, extra_args, state, skip_pgp_check, i
changed_iter = False changed_iter = False
for package in packages: for package in packages:
if state == 'present': if state == 'present' and package_installed(module, package):
if package_installed(module, package): rc = 0
rc = 0 continue
continue
if use == 'makepkg': if use == 'makepkg':
rc, out, err = install_with_makepkg(module, package, extra_args, skip_pgp_check, ignore_arch, local_pkgbuild) rc, out, err = install_with_makepkg(module, package, extra_args, skip_pgp_check, ignore_arch, local_pkgbuild)
elif local_pkgbuild: elif local_pkgbuild: