ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-03 12:44:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

apk: command args as list rather than string

Browse source
This commit is contained in:
Alexei Znamensky 2025-07-30 16:53:50 +12:00
commit c11cd8986a
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
plugins/modules/apk.py
View file

@ -184,7 +184,7 @@ def parse_for_packages(stdout):
def update_package_db(module, exit):
cmd = "%s update" % (APK_PATH)
cmd = [APK_PATH, "update"]
rc, stdout, stderr = module.run_command(cmd, check_rc=False)
if rc != 0:
module.fail_json(msg="could not update package db", stdout=stdout, stderr=stderr)
@ -207,7 +207,7 @@ def query_toplevel(module, name, world):
def query_package(module, name):
cmd = "%s -v info --installed %s" % (APK_PATH, name)
cmd = [APK_PATH, "-v", "info", "--installed", name]
rc, stdout, stderr = module.run_command(cmd, check_rc=False)
if rc == 0:
return True
@ -216,7 +216,7 @@ def query_package(module, name):
def query_latest(module, name):
cmd = "%s version %s" % (APK_PATH, name)
cmd = [APK_PATH, "version", name]
rc, stdout, stderr = module.run_command(cmd, check_rc=False)
search_pattern = r"(%s)-[\d\.\w]+-[\d\w]+\s+(.)\s+[\d\.\w]+-[\d\w]+\s+" % (re.escape(name))
match = re.search(search_pattern, stdout)
@ -226,7 +226,7 @@ def query_latest(module, name):
def query_virtual(module, name):
cmd = "%s -v info --description %s" % (APK_PATH, name)
cmd = [APK_PATH, "-v", "info", "--description", name]
rc, stdout, stderr = module.run_command(cmd, check_rc=False)
search_pattern = r"^%s: virtual meta package" % (re.escape(name))
if re.search(search_pattern, stdout):
@ -235,7 +235,7 @@ def query_virtual(module, name):
def get_dependencies(module, name):
cmd = "%s -v info --depends %s" % (APK_PATH, name)
cmd = [APK_PATH, "-v", "info", "--depends", name]
rc, stdout, stderr = module.run_command(cmd, check_rc=False)
dependencies = stdout.split()
if len(dependencies) > 1:
@ -246,11 +246,11 @@ def get_dependencies(module, name):
def upgrade_packages(module, available):
if module.check_mode:
cmd = "%s upgrade --simulate" % (APK_PATH)
cmd = [APK_PATH, "upgrade", "--simulate"]
else:
cmd = "%s upgrade" % (APK_PATH)
cmd = [APK_PATH, "upgrade"]
if available:
cmd = "%s --available" % cmd
cmd.append("--available")
rc, stdout, stderr = module.run_command(cmd, check_rc=False)
packagelist = parse_for_packages(stdout)
if rc != 0:
@ -284,14 +284,14 @@ def install_packages(module, names, state, world):
packages = " ".join(to_install + to_upgrade)
if upgrade:
if module.check_mode:
cmd = "%s add --upgrade --simulate %s" % (APK_PATH, packages)
cmd = [APK_PATH, "add", "--upgrade", "--simulate", packages]
else:
cmd = "%s add --upgrade %s" % (APK_PATH, packages)
cmd = [APK_PATH, "add", "--upgrade", packages]
else:
if module.check_mode:
cmd = "%s add --simulate %s" % (APK_PATH, packages)
cmd = [APK_PATH, "add", "--simulate", packages]
else:
cmd = "%s add %s" % (APK_PATH, packages)
cmd = [APK_PATH, "add", packages]
rc, stdout, stderr = module.run_command(cmd, check_rc=False)
packagelist = parse_for_packages(stdout)
if rc != 0:
@ -308,9 +308,9 @@ def remove_packages(module, names):
module.exit_json(changed=False, msg="package(s) already removed")
names = " ".join(installed)
if module.check_mode:
cmd = "%s del --purge --simulate %s" % (APK_PATH, names)
cmd = [APK_PATH, "del", "--purge", "--simulate", names]
else:
cmd = "%s del --purge %s" % (APK_PATH, names)
cmd = [APK_PATH, "del", "--purge", names]
rc, stdout, stderr = module.run_command(cmd, check_rc=False)
packagelist = parse_for_packages(stdout)
# Check to see if packages are still present because of dependencies