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

xbps: command args as list rather than string (#10608)

Browse source 
* xbps: command args as list rather than string

* add changelog frag
This commit is contained in:
Alexei Znamensky 2025-08-10 23:38:47 +12:00 • committed by GitHub
commit c16cf774d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/10608-xbps-cmd-list.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- xbps - using safer mechanism to run external command (https://github.com/ansible-collections/community.general/pull/10608).

22
plugins/modules/xbps.py
View file

@ -174,10 +174,10 @@ def is_installed(xbps_output):
def append_flags(module, xbps_path, cmd, skip_repo=False): def append_flags(module, xbps_path, cmd, skip_repo=False):
"""Appends the repository/root flags when needed""" """Appends the repository/root flags when needed"""
if module.params["root"]: if module.params["root"]:
cmd = "%s -r %s" % (cmd, module.params["root"]) cmd = cmd + ["-r", module.params["root"]]
if module.params["repositories"] and not cmd.startswith(xbps_path["remove"]) and not skip_repo: if module.params["repositories"] and cmd[0] != xbps_path["remove"] and not skip_repo:
for repo in module.params["repositories"]: for repo in module.params["repositories"]:
cmd = "%s --repository=%s" % (cmd, repo) cmd = cmd + ["--repository=%s" % repo]
return cmd return cmd
@ -185,14 +185,14 @@ def append_flags(module, xbps_path, cmd, skip_repo=False):
def query_package(module, xbps_path, name, state="present"): def query_package(module, xbps_path, name, state="present"):
"""Returns Package info""" """Returns Package info"""
if state == "present": if state == "present":
lcmd = "%s %s" % (xbps_path['query'], name) lcmd = [xbps_path['query'], name]
lcmd = append_flags(module, xbps_path, lcmd, skip_repo=True) lcmd = append_flags(module, xbps_path, lcmd, skip_repo=True)
lrc, lstdout, lstderr = module.run_command(lcmd, check_rc=False) lrc, lstdout, lstderr = module.run_command(lcmd, check_rc=False)
if not is_installed(lstdout): if not is_installed(lstdout):
# package is not installed locally # package is not installed locally
return False, False return False, False
rcmd = "%s -Sun" % (xbps_path['install']) rcmd = [xbps_path['install'], "-Sun"]
rcmd = append_flags(module, xbps_path, rcmd) rcmd = append_flags(module, xbps_path, rcmd)
rrc, rstdout, rstderr = module.run_command(rcmd, check_rc=False) rrc, rstdout, rstderr = module.run_command(rcmd, check_rc=False)
if rrc == 0 or rrc == 17: if rrc == 0 or rrc == 17:
@ -206,7 +206,7 @@ def query_package(module, xbps_path, name, state="present"):
def update_package_db(module, xbps_path): def update_package_db(module, xbps_path):
"""Returns True if update_package_db changed""" """Returns True if update_package_db changed"""
cmd = "%s -S" % (xbps_path['install']) cmd = [xbps_path['install'], "-S"]
cmd = append_flags(module, xbps_path, cmd) cmd = append_flags(module, xbps_path, cmd)
if module.params['accept_pubkey']: if module.params['accept_pubkey']:
stdin = "y\n" stdin = "y\n"
@ -225,7 +225,7 @@ def update_package_db(module, xbps_path):
def upgrade_xbps(module, xbps_path, exit_on_success=False): def upgrade_xbps(module, xbps_path, exit_on_success=False):
cmdupgradexbps = "%s -uy xbps" % (xbps_path['install']) cmdupgradexbps = [xbps_path['install'], "-uy", "xbps"]
cmdupgradexbps = append_flags(module, xbps_path, cmdupgradexbps) cmdupgradexbps = append_flags(module, xbps_path, cmdupgradexbps)
rc, stdout, stderr = module.run_command(cmdupgradexbps, check_rc=False) rc, stdout, stderr = module.run_command(cmdupgradexbps, check_rc=False)
if rc != 0: if rc != 0:
@ -234,8 +234,8 @@ def upgrade_xbps(module, xbps_path, exit_on_success=False):
def upgrade(module, xbps_path): def upgrade(module, xbps_path):
"""Returns true is full upgrade succeeds""" """Returns true is full upgrade succeeds"""
cmdupgrade = "%s -uy" % (xbps_path['install']) cmdupgrade = [xbps_path['install'], "-uy"]
cmdneedupgrade = "%s -un" % (xbps_path['install']) cmdneedupgrade = [xbps_path['install'], "-un"]
cmdupgrade = append_flags(module, xbps_path, cmdupgrade) cmdupgrade = append_flags(module, xbps_path, cmdupgrade)
cmdneedupgrade = append_flags(module, xbps_path, cmdneedupgrade) cmdneedupgrade = append_flags(module, xbps_path, cmdneedupgrade)
@ -270,7 +270,7 @@ def remove_packages(module, xbps_path, packages):
if not installed: if not installed:
continue continue
cmd = "%s -y %s" % (xbps_path['remove'], package) cmd = [xbps_path['remove'], "-y", package]
cmd = append_flags(module, xbps_path, cmd, skip_repo=True) cmd = append_flags(module, xbps_path, cmd, skip_repo=True)
rc, stdout, stderr = module.run_command(cmd, check_rc=False) rc, stdout, stderr = module.run_command(cmd, check_rc=False)
@ -303,7 +303,7 @@ def install_packages(module, xbps_path, state, packages):
if len(toInstall) == 0: if len(toInstall) == 0:
module.exit_json(changed=False, msg="Nothing to Install") module.exit_json(changed=False, msg="Nothing to Install")
cmd = "%s -y %s" % (xbps_path['install'], " ".join(toInstall)) cmd = [xbps_path['install'], "-y"] + toInstall
cmd = append_flags(module, xbps_path, cmd) cmd = append_flags(module, xbps_path, cmd)
rc, stdout, stderr = module.run_command(cmd, check_rc=False) rc, stdout, stderr = module.run_command(cmd, check_rc=False)