mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
[Pacman Module] Allow for the pacman repository check to be skipped when it's not needed (#3606)
* Allow for the pacman repository check to be skipped when it's not needed * Adding a changelog fragment * Undo the variable rename because the lint doesn't like it * Update changelogs/fragments/3606-pacman-speed-up-check-if-package-is-installed.yml Co-authored-by: Felix Fontein <felix@fontein.de> Co-authored-by: Elie Moreau <emoreau@atlassian.com> Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
cdfc4dcf49
commit
38e0d97c8b
2 changed files with 33 additions and 26 deletions
|
@ -0,0 +1,2 @@
|
||||||
|
minor_changes:
|
||||||
|
- "pacman - speed up checking if the package is installed, when the latest version check is not needed (https://github.com/ansible-collections/community.general/pull/3606)."
|
|
@ -189,38 +189,43 @@ def get_name(module, pacman_output):
|
||||||
module.fail_json(msg="get_name: fail to retrieve package name from pacman output")
|
module.fail_json(msg="get_name: fail to retrieve package name from pacman output")
|
||||||
|
|
||||||
|
|
||||||
def query_package(module, pacman_path, name, state="present"):
|
def query_package(module, pacman_path, name, state):
|
||||||
"""Query the package status in both the local system and the repository. Returns a boolean to indicate if the package is installed, a second
|
"""Query the package status in both the local system and the repository. Returns a boolean to indicate if the package is installed, a second
|
||||||
boolean to indicate if the package is up-to-date and a third boolean to indicate whether online information were available
|
boolean to indicate if the package is up-to-date and a third boolean to indicate whether online information were available
|
||||||
"""
|
"""
|
||||||
if state == "present":
|
|
||||||
lcmd = "%s --query %s" % (pacman_path, name)
|
lcmd = "%s --query %s" % (pacman_path, name)
|
||||||
lrc, lstdout, lstderr = module.run_command(lcmd, check_rc=False)
|
lrc, lstdout, lstderr = module.run_command(lcmd, check_rc=False)
|
||||||
if lrc != 0:
|
if lrc != 0:
|
||||||
# package is not installed locally
|
# package is not installed locally
|
||||||
|
return False, False, False
|
||||||
|
else:
|
||||||
|
# a non-zero exit code doesn't always mean the package is installed
|
||||||
|
# for example, if the package name queried is "provided" by another package
|
||||||
|
installed_name = get_name(module, lstdout)
|
||||||
|
if installed_name != name:
|
||||||
return False, False, False
|
return False, False, False
|
||||||
else:
|
|
||||||
# a non-zero exit code doesn't always mean the package is installed
|
|
||||||
# for example, if the package name queried is "provided" by another package
|
|
||||||
installed_name = get_name(module, lstdout)
|
|
||||||
if installed_name != name:
|
|
||||||
return False, False, False
|
|
||||||
|
|
||||||
# get the version installed locally (if any)
|
# no need to check the repository if state is present or absent
|
||||||
lversion = get_version(lstdout)
|
# return False for package version check, because we didn't check it
|
||||||
|
if state == 'present' or state == 'absent':
|
||||||
|
return True, False, False
|
||||||
|
|
||||||
rcmd = "%s --sync --print-format \"%%n %%v\" %s" % (pacman_path, name)
|
# get the version installed locally (if any)
|
||||||
rrc, rstdout, rstderr = module.run_command(rcmd, check_rc=False)
|
lversion = get_version(lstdout)
|
||||||
# get the version in the repository
|
|
||||||
rversion = get_version(rstdout)
|
|
||||||
|
|
||||||
if rrc == 0:
|
rcmd = "%s --sync --print-format \"%%n %%v\" %s" % (pacman_path, name)
|
||||||
# Return True to indicate that the package is installed locally, and the result of the version number comparison
|
rrc, rstdout, rstderr = module.run_command(rcmd, check_rc=False)
|
||||||
# to determine if the package is up-to-date.
|
# get the version in the repository
|
||||||
return True, (lversion == rversion), False
|
rversion = get_version(rstdout)
|
||||||
|
|
||||||
|
if rrc == 0:
|
||||||
|
# Return True to indicate that the package is installed locally, and the result of the version number comparison
|
||||||
|
# to determine if the package is up-to-date.
|
||||||
|
return True, (lversion == rversion), False
|
||||||
|
|
||||||
# package is installed but cannot fetch remote Version. Last True stands for the error
|
# package is installed but cannot fetch remote Version. Last True stands for the error
|
||||||
return True, True, True
|
return True, True, True
|
||||||
|
|
||||||
|
|
||||||
def update_package_db(module, pacman_path):
|
def update_package_db(module, pacman_path):
|
||||||
|
@ -291,7 +296,7 @@ def remove_packages(module, pacman_path, packages):
|
||||||
# Using a for loop in case of error, we can report the package that failed
|
# Using a for loop in case of error, we can report the package that failed
|
||||||
for package in packages:
|
for package in packages:
|
||||||
# Query the package first, to see if we even need to remove
|
# Query the package first, to see if we even need to remove
|
||||||
installed, updated, unknown = query_package(module, pacman_path, package)
|
installed, updated, unknown = query_package(module, pacman_path, package, 'absent')
|
||||||
if not installed:
|
if not installed:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
@ -330,7 +335,7 @@ def install_packages(module, pacman_path, state, packages, package_files):
|
||||||
to_install_files = []
|
to_install_files = []
|
||||||
for i, package in enumerate(packages):
|
for i, package in enumerate(packages):
|
||||||
# if the package is installed and state == present or state == latest and is up-to-date then skip
|
# if the package is installed and state == present or state == latest and is up-to-date then skip
|
||||||
installed, updated, latestError = query_package(module, pacman_path, package)
|
installed, updated, latestError = query_package(module, pacman_path, package, state)
|
||||||
if latestError and state == 'latest':
|
if latestError and state == 'latest':
|
||||||
package_err.append(package)
|
package_err.append(package)
|
||||||
|
|
||||||
|
@ -399,7 +404,7 @@ def check_packages(module, pacman_path, packages, state):
|
||||||
}
|
}
|
||||||
|
|
||||||
for package in packages:
|
for package in packages:
|
||||||
installed, updated, unknown = query_package(module, pacman_path, package)
|
installed, updated, unknown = query_package(module, pacman_path, package, state)
|
||||||
if ((state in ["present", "latest"] and not installed) or
|
if ((state in ["present", "latest"] and not installed) or
|
||||||
(state == "absent" and installed) or
|
(state == "absent" and installed) or
|
||||||
(state == "latest" and not updated)):
|
(state == "latest" and not updated)):
|
||||||
|
|
Loading…
Reference in a new issue