From d60edc4ac11d3766abeb9160c9850394fe5a2459 Mon Sep 17 00:00:00 2001 From: Alexei Znamensky <103110+russoz@users.noreply.github.com> Date: Tue, 30 Nov 2021 18:04:55 +1300 Subject: [PATCH] iso_extract - invoke run_command passing list (#3805) * iso_extract - invoke run_command passing list * added changelog fragment --- .../fragments/3805-iso_extract-run_command-list.yaml | 2 ++ plugins/modules/files/iso_extract.py | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 changelogs/fragments/3805-iso_extract-run_command-list.yaml diff --git a/changelogs/fragments/3805-iso_extract-run_command-list.yaml b/changelogs/fragments/3805-iso_extract-run_command-list.yaml new file mode 100644 index 0000000000..3def756aa1 --- /dev/null +++ b/changelogs/fragments/3805-iso_extract-run_command-list.yaml @@ -0,0 +1,2 @@ +minor_changes: + - iso_extract - calling ``run_command`` with arguments as ``list`` instead of ``str`` (https://github.com/ansible-collections/community.general/pull/3805). diff --git a/plugins/modules/files/iso_extract.py b/plugins/modules/files/iso_extract.py index 18c283cbf7..81fe6b662f 100644 --- a/plugins/modules/files/iso_extract.py +++ b/plugins/modules/files/iso_extract.py @@ -85,11 +85,6 @@ import os.path import shutil import tempfile -try: # python 3.3+ - from shlex import quote -except ImportError: # older python - from pipes import quote - from ansible.module_utils.basic import AnsibleModule @@ -154,9 +149,9 @@ def main(): # Use 7zip when we have a binary, otherwise try to mount if binary: - cmd = '%s x "%s" -o"%s" %s' % (binary, image, tmp_dir, ' '.join([quote(f) for f in extract_files])) + cmd = [binary, 'x', image, '-o%s' % tmp_dir] + extract_files else: - cmd = 'mount -o loop,ro "%s" "%s"' % (image, tmp_dir) + cmd = [module.get_bin_path('mount'), '-o', 'loop,ro', image, tmp_dir] rc, out, err = module.run_command(cmd) if rc != 0: @@ -201,7 +196,7 @@ def main(): result['changed'] = True finally: if not binary: - module.run_command('umount "%s"' % tmp_dir) + module.run_command([module.get_bin_path('umount'), tmp_dir]) shutil.rmtree(tmp_dir)