summaryrefslogtreecommitdiff
path: root/packaging/os
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2016-10-27 12:36:46 -0700
committerToshio Kuratomi <a.badger@gmail.com>2016-10-27 15:49:22 -0700
commit86d71bd97186e95ac00057a1bd976716ffdb1987 (patch)
tree4aadb34138849cdab8a37004bc74227f6c55bb28 /packaging/os
parent21bdd8810b7093d6c3e5bd82878facb114725602 (diff)
downloadansible-modules-extras-86d71bd97186e95ac00057a1bd976716ffdb1987.tar.gz
* Fix for spaces in the package spec.
* Fix for python-2.6 compat
Diffstat (limited to 'packaging/os')
-rw-r--r--packaging/os/dnf.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/packaging/os/dnf.py b/packaging/os/dnf.py
index 18484ec4..65f3a082 100644
--- a/packaging/os/dnf.py
+++ b/packaging/os/dnf.py
@@ -279,13 +279,13 @@ def ensure(module, base, state, names):
if state in ['installed', 'present']:
# Install files.
- for filename in filenames:
+ for filename in (f.strip() for f in filenames):
base.package_install(base.add_remote_rpm(filename))
# Install groups.
- for group in groups:
+ for group in (g.strip() for g in groups):
base.group_install(group, dnf.const.GROUP_PACKAGE_TYPES)
# 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)
elif state == 'latest':
@@ -330,9 +330,9 @@ def ensure(module, base, state, names):
base.do_transaction()
response = {'changed': True, 'results': []}
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:
- response['results'].append("Removed: {}".format(package))
+ response['results'].append("Removed: {0}".format(package))
module.exit_json(**response)