From 3b700f0998268253fa11f8942979afb13baabacf Mon Sep 17 00:00:00 2001 From: Alexei Znamensky <103110+russoz@users.noreply.github.com> Date: Tue, 11 Nov 2025 19:10:10 +1300 Subject: [PATCH] yum_versionlock: remove to_native() around command output (#11093) * yum_versionlock: remove redundant use of to_native() around command output * reformat * add changelog frag --- changelogs/fragments/11093-yum-versionlock-to-native.yml | 2 ++ plugins/modules/yum_versionlock.py | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 changelogs/fragments/11093-yum-versionlock-to-native.yml diff --git a/changelogs/fragments/11093-yum-versionlock-to-native.yml b/changelogs/fragments/11093-yum-versionlock-to-native.yml new file mode 100644 index 0000000000..8509e5f0a7 --- /dev/null +++ b/changelogs/fragments/11093-yum-versionlock-to-native.yml @@ -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). diff --git a/plugins/modules/yum_versionlock.py b/plugins/modules/yum_versionlock.py index dbf2229f44..1cb1539136 100644 --- a/plugins/modules/yum_versionlock.py +++ b/plugins/modules/yum_versionlock.py @@ -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):