cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dnf - fix error formatting of module name in error message (#58647)

Browse source
This commit is contained in:
Sam Doran 2019-07-09 04:16:43 -04:00 committed by Martin Krizek
parent 1f427249d5
commit 1c2c1c15d0
2 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/dnf-fix-module-name-in-error-message.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- dnf - fix formatting of module name in error message (https://github.com/ansible/ansible/pull/58647)

27
lib/ansible/modules/packaging/os/dnf.py
View file

@ -946,14 +946,7 @@ class DnfModule(YumDnf):
self.module_base.install([module]) self.module_base.install([module])
self.module_base.enable([module]) self.module_base.enable([module])
except dnf.exceptions.MarkingErrors as e: except dnf.exceptions.MarkingErrors as e:
failure_response['failures'].append( failure_response['failures'].append(' '.join((module, to_native(e))))
" ".join(
(
' '.join(module),
to_native(e)
)
)
)
# Install groups. # Install groups.
for group in groups: for group in groups:
@ -1016,14 +1009,7 @@ class DnfModule(YumDnf):
response['results'].append("Module {0} upgraded.".format(module)) response['results'].append("Module {0} upgraded.".format(module))
self.module_base.upgrade([module]) self.module_base.upgrade([module])
except dnf.exceptions.MarkingErrors as e: except dnf.exceptions.MarkingErrors as e:
failure_response['failures'].append( failure_response['failures'].append(' '.join((module, to_native(e))))
" ".join(
(
' '.join(module),
to_native(e)
)
)
)
for group in groups: for group in groups:
try: try:
@ -1087,14 +1073,7 @@ class DnfModule(YumDnf):
self.module_base.disable([module]) self.module_base.disable([module])
self.module_base.reset([module]) self.module_base.reset([module])
except dnf.exceptions.MarkingErrors as e: except dnf.exceptions.MarkingErrors as e:
failure_response['failures'].append( failure_response['failures'].append(' '.join((module, to_native(e))))
" ".join(
(
' '.join(module),
to_native(e)
)
)
)
for group in groups: for group in groups:
try: try: