internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-03-26 21:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

* reformat

* add changelog frag
This commit is contained in:
Alexei Znamensky
2025-11-11 19:10:10 +13:00
committed by GitHub
parent 634be713bb
commit 3b700f0998
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 import re
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.common.text.converters import to_native
from fnmatch import fnmatch from fnmatch import fnmatch
# on DNF-based distros, yum is a symlink to dnf, so we try to handle their different entry formats. # 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: if rc == 0:
return out return out
elif rc == 1 and "o such command:" in err: elif rc == 1 and "o such command:" in err:
self.module.fail_json( self.module.fail_json(msg=f"Error: Please install rpm package yum-plugin-versionlock : {err}{out}")
msg=f"Error: Please install rpm package yum-plugin-versionlock : {to_native(err)}{to_native(out)}" self.module.fail_json(msg=f"Error: {err}{out}")
)
self.module.fail_json(msg=f"Error: {to_native(err)}{to_native(out)}")
def ensure_state(self, packages, command): def ensure_state(self, packages, command):
"""Ensure packages state""" """Ensure packages state"""
@@ -127,7 +124,7 @@ class YumVersionLock:
self.module.fail_json(msg=out) self.module.fail_json(msg=out)
if rc == 0: if rc == 0:
return True 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): def match(entry, name):