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

[PR #10605/2dd74b3f backport][stable-11] swupd: command args as list rather than string (#10629)

Browse source 
swupd: command args as list rather than string (#10605)

* swupd: command args as list rather than string

* add changelog frag

(cherry picked from commit 2dd74b3f3c)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2025-08-10 13:51:10 +02:00 • committed by GitHub
commit a119ae2833
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/10605-swupd-cmd-list.yml Normal file
View file

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

24
plugins/modules/swupd.py
View file

@ -130,19 +130,19 @@ class Swupd(object):
self.rc, self.stdout, self.stderr = self.module.run_command(cmd, check_rc=False)
def _get_cmd(self, command):
cmd = "%s %s" % (self.swupd_cmd, command)
cmd = [self.swupd_cmd] + command
if self.format:
cmd += " --format=%s" % self.format
cmd.append("--format=%s" % self.format)
if self.manifest:
cmd += " --manifest=%s" % self.manifest
cmd.append("--manifest=%s" % self.manifest)
if self.url:
cmd += " --url=%s" % self.url
cmd.append("--url=%s" % self.url)
else:
if self.contenturl and command != "check-update":
cmd += " --contenturl=%s" % self.contenturl
cmd.append("--contenturl=%s" % self.contenturl)
if self.versionurl:
cmd += " --versionurl=%s" % self.versionurl
cmd.append("--versionurl=%s" % self.versionurl)
return cmd
@ -155,7 +155,7 @@ class Swupd(object):
return True
def _needs_update(self):
cmd = self._get_cmd("check-update")
cmd = self._get_cmd(["check-update"])
self._run_cmd(cmd)
if self.rc == 0:
@ -168,7 +168,7 @@ class Swupd(object):
self.msg = "Failed to check for updates"
def _needs_verify(self):
cmd = self._get_cmd("verify")
cmd = self._get_cmd(["verify"])
self._run_cmd(cmd)
if self.rc != 0:
@ -189,7 +189,7 @@ class Swupd(object):
self.msg = "Bundle %s is already installed" % bundle
return
cmd = self._get_cmd("bundle-add %s" % bundle)
cmd = self._get_cmd(["bundle-add", bundle])
self._run_cmd(cmd)
if self.rc == 0:
@ -209,7 +209,7 @@ class Swupd(object):
self.msg = "Bundle %s not installed"
return
cmd = self._get_cmd("bundle-remove %s" % bundle)
cmd = self._get_cmd(["bundle-remove", bundle])
self._run_cmd(cmd)
if self.rc == 0:
@ -229,7 +229,7 @@ class Swupd(object):
self.msg = "There are no updates available"
return
cmd = self._get_cmd("update")
cmd = self._get_cmd(["update"])
self._run_cmd(cmd)
if self.rc == 0:
@ -249,7 +249,7 @@ class Swupd(object):
self.msg = "No files where changed"
return
cmd = self._get_cmd("verify --fix")
cmd = self._get_cmd(["verify", "--fix"])
self._run_cmd(cmd)
if self.rc == 0 and (self.FILES_REPLACED in self.stdout or self.FILES_FIXED in self.stdout or self.FILES_DELETED in self.stdout):