ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-03-25 14:47:26 +00:00
Code Activity

[PR #11093/3b700f09 backport][stable-12] yum_versionlock: remove to_native() around command output (#11101)

Browse source 
yum_versionlock: remove to_native() around command output (#11093)

* yum_versionlock: remove redundant use of to_native() around command output

* reformat

* add changelog frag

(cherry picked from commit 3b700f0998)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2025-11-11 07:23:19 +01:00 • committed by GitHub
parent d487734fea
commit 768f16e9c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/11093-yum-versionlock-to-native.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- yum_versionlock - remove redundant conversion to unicode in command output (https://github.com/ansible-collections/community.general/pull/11093).

9
plugins/modules/yum_versionlock.py
View file

@ -88,7 +88,6 @@ state:
import re
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.common.text.converters import to_native
from fnmatch import fnmatch
# on DNF-based distros, yum is a symlink to dnf, so we try to handle their different entry formats.
@ -114,10 +113,8 @@ class YumVersionLock:
if rc == 0:
return out
elif rc == 1 and "o such command:" in err:
self.module.fail_json(
msg=f"Error: Please install rpm package yum-plugin-versionlock : {to_native(err)}{to_native(out)}"
)
self.module.fail_json(msg=f"Error: {to_native(err)}{to_native(out)}")
self.module.fail_json(msg=f"Error: Please install rpm package yum-plugin-versionlock : {err}{out}")
self.module.fail_json(msg=f"Error: {err}{out}")
def ensure_state(self, packages, command):
"""Ensure packages state"""
@ -127,7 +124,7 @@ class YumVersionLock:
self.module.fail_json(msg=out)
if rc == 0:
return True
self.module.fail_json(msg=f"Error: {to_native(err)}{to_native(out)}")
self.module.fail_json(msg=f"Error: {err}{out}")
def match(entry, name):