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

* Fix for spaces in the package spec. * Fix for python-2.6 compat

Browse source
This commit is contained in:
Toshio Kuratomi 2016-10-27 12:36:46 -07:00 committed by Matt Clay
parent d558c55cee
commit 09c56140cd
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/extras/packaging/os/dnf.py
View file

@ -286,13 +286,13 @@ def ensure(module, base, state, names):
if state in ['installed', 'present']: if state in ['installed', 'present']:
# Install files. # Install files.
for filename in filenames: for filename in (f.strip() for f in filenames):
base.package_install(base.add_remote_rpm(filename)) base.package_install(base.add_remote_rpm(filename))
# Install groups. # Install groups.
for group in groups: for group in (g.strip() for g in groups):
base.group_install(group, dnf.const.GROUP_PACKAGE_TYPES) base.group_install(group, dnf.const.GROUP_PACKAGE_TYPES)
# Install packages. # Install packages.
for pkg_spec in pkg_specs: for pkg_spec in (p.strip() for p in pkg_specs):
_mark_package_install(module, base, pkg_spec) _mark_package_install(module, base, pkg_spec)
elif state == 'latest': elif state == 'latest':
@ -337,9 +337,9 @@ def ensure(module, base, state, names):
base.do_transaction() base.do_transaction()
response = {'changed': True, 'results': []} response = {'changed': True, 'results': []}
for package in base.transaction.install_set: for package in base.transaction.install_set:
response['results'].append("Installed: {}".format(package)) response['results'].append("Installed: {0}".format(package))
for package in base.transaction.remove_set: for package in base.transaction.remove_set:
response['results'].append("Removed: {}".format(package)) response['results'].append("Removed: {0}".format(package))
module.exit_json(**response) module.exit_json(**response)