ansible/ansible-podman-collections
1
0
Fork 0
mirror of https://github.com/containers/ansible-podman-collections.git synced 2026-02-04 07:11:49 +00:00
Code Activity

Fix Ansible sanity issues for new version (#974)

Browse source 
Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
This commit is contained in:
Sergey 2025-08-29 11:58:20 +03:00 • committed by GitHub
parent 73b7bb1d3e
commit 15423c0a5a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/module_utils/podman/common.py
View file

@ -9,22 +9,17 @@ import json
import os
import shutil
from ansible.module_utils.six import raise_from
try:
from ansible.module_utils.compat.version import LooseVersion # noqa: F401
except ImportError:
try:
from distutils.version import LooseVersion # noqa: F401
except ImportError as exc:
raise_from(
ImportError(
"To use this plugin or module with ansible-core"
" < 2.11, you need to use Python < 3.12 with "
"distutils.version present"
),
exc,
)
raise ImportError(
"To use this plugin or module with ansible-core"
" < 2.11, you need to use Python < 3.12 with "
"distutils.version present"
) from exc
ARGUMENTS_OPTS_DICT = {
"--attach": ["--attach", "-a"],

3
plugins/modules/podman_container_exec.py
View file

@ -123,7 +123,6 @@ exec_id:
import shlex
from ansible.module_utils.six import string_types
from ansible.module_utils._text import to_text
from ansible.module_utils.basic import AnsibleModule
from ansible_collections.containers.podman.plugins.module_utils.podman.common import (
@ -159,7 +158,7 @@ def run_container_exec(module: AnsibleModule) -> dict:
if env is not None:
for key, value in env.items():
if not isinstance(value, string_types):
if not isinstance(value, str):
module.fail_json(msg="Specify string value %s on the env field" % (value))
to_text(value, errors="surrogate_or_strict")