internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace batch of redundant to_native()/to_text() occurrences (#11106)

Browse Source 
* replace batch of redundant to_native()/to_text() occurrences

* add changelog frag

* snap sanity

* rolling back snap for now

* more cases in redhat_subscription
This commit is contained in:
Alexei Znamensky
2025-11-13 09:43:14 +13:00
committed by GitHub
parent 9b8867399e
commit f785e9c780
14 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/modules/flatpak_remote.py
View File

@@ -113,7 +113,6 @@ command:
"""
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.common.text.converters import to_bytes, to_native
def add_remote(module, binary, name, flatpakrepo_url, method):
@@ -141,7 +140,7 @@ def remote_exists(module, binary, name, method):
listed_remote = line.split()
if len(listed_remote) == 0:
continue
if listed_remote[0] == to_native(name):
if listed_remote[0] == name:
return True
return False
@@ -171,7 +170,7 @@ def remote_enabled(module, binary, name, method):
listed_remote = line.split()
if len(listed_remote) == 0:
continue
if listed_remote[0] == to_native(name):
if listed_remote[0] == name:
return len(listed_remote) == 1 or "disabled" not in listed_remote[1].split(",")
return False
@@ -219,7 +218,7 @@ def main():
if not binary:
module.fail_json(msg=f"Executable '{executable}' was not found on the system.", **result)
remote_already_exists = remote_exists(module, binary, to_bytes(name), method)
remote_already_exists = remote_exists(module, binary, name, method)
if state == "present" and not remote_already_exists:
add_remote(module, binary, name, flatpakrepo_url, method)
@@ -227,7 +226,7 @@ def main():
remove_remote(module, binary, name, method)
if state == "present":
remote_already_enabled = remote_enabled(module, binary, to_bytes(name), method)
remote_already_enabled = remote_enabled(module, binary, name, method)
if enabled and not remote_already_enabled:
enable_remote(module, binary, name, method)