From 1c2c1c15d0483e85b1addf4c6f15c80135ef02a3 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Tue, 9 Jul 2019 04:16:43 -0400 Subject: [PATCH] dnf - fix error formatting of module name in error message (#58647) --- .../dnf-fix-module-name-in-error-message.yml | 2 ++ lib/ansible/modules/packaging/os/dnf.py | 27 +++---------------- 2 files changed, 5 insertions(+), 24 deletions(-) create mode 100644 changelogs/fragments/dnf-fix-module-name-in-error-message.yml diff --git a/changelogs/fragments/dnf-fix-module-name-in-error-message.yml b/changelogs/fragments/dnf-fix-module-name-in-error-message.yml new file mode 100644 index 00000000000..a8991074cad --- /dev/null +++ b/changelogs/fragments/dnf-fix-module-name-in-error-message.yml @@ -0,0 +1,2 @@ +bugfixes: + - dnf - fix formatting of module name in error message (https://github.com/ansible/ansible/pull/58647) diff --git a/lib/ansible/modules/packaging/os/dnf.py b/lib/ansible/modules/packaging/os/dnf.py index 995180667e8..180c1651d60 100644 --- a/lib/ansible/modules/packaging/os/dnf.py +++ b/lib/ansible/modules/packaging/os/dnf.py @@ -946,14 +946,7 @@ class DnfModule(YumDnf): self.module_base.install([module]) self.module_base.enable([module]) except dnf.exceptions.MarkingErrors as e: - failure_response['failures'].append( - " ".join( - ( - ' '.join(module), - to_native(e) - ) - ) - ) + failure_response['failures'].append(' '.join((module, to_native(e)))) # Install groups. for group in groups: @@ -1016,14 +1009,7 @@ class DnfModule(YumDnf): response['results'].append("Module {0} upgraded.".format(module)) self.module_base.upgrade([module]) except dnf.exceptions.MarkingErrors as e: - failure_response['failures'].append( - " ".join( - ( - ' '.join(module), - to_native(e) - ) - ) - ) + failure_response['failures'].append(' '.join((module, to_native(e)))) for group in groups: try: @@ -1087,14 +1073,7 @@ class DnfModule(YumDnf): self.module_base.disable([module]) self.module_base.reset([module]) except dnf.exceptions.MarkingErrors as e: - failure_response['failures'].append( - " ".join( - ( - ' '.join(module), - to_native(e) - ) - ) - ) + failure_response['failures'].append(' '.join((module, to_native(e)))) for group in groups: try: