ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 11:51:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[PR #6826/eb734d03 backport][stable-7] snap: fix bug when processing output (#6829)

Browse source 
snap: fix bug when processing output (#6826)

* snap: fix bug when processing output

* add changelog frag

(cherry picked from commit eb734d03c0)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2023-07-02 21:45:16 +02:00 • committed by GitHub
parent 751e2400e6
commit 6c718a4f55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 483 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/modules/snap.py
View file

@ -207,25 +207,25 @@ class Snap(StateModuleHelper):
rc, out, err = ctx.run(state=state, name=actionable_names)
results_cmd.append(commands + actionable_names)
results_rc.append(rc)
results_out.append(out)
results_err.append(err)
results_out.append(out.strip())
results_err.append(err.strip())
results_run_info.append(ctx.run_info)
else:
for name in actionable_names:
rc, out, err = ctx.run(state=state, name=name)
results_cmd.append(commands + [name])
results_rc.append(rc)
results_out.append(out)
results_err.append(err)
results_out.append(out.strip())
results_err.append(err.strip())
results_run_info.append(ctx.run_info)
return [
return (
'; '.join([to_native(x) for x in results_cmd]),
self._first_non_zero(results_rc),
'\n'.join(results_out),
'\n'.join(results_err),
results_run_info,
]
)
def __quit_module__(self):
if self.vars.channel is None:
@ -324,8 +324,8 @@ class Snap(StateModuleHelper):
self.vars.run_info = run_info
if rc == 0:
match_install = [self.__install_re.match(line) for line in out.split('\n')]
match_install = [m.group('name') in actionable_snaps for m in match_install if m]
match_install2 = [self.__install_re.match(line) for line in out.split('\n')]
match_install = [m.group('name') in actionable_snaps for m in match_install2 if m]
if len(match_install) == len(actionable_snaps):
return