Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

yum/dnf: fail when space separated string of names #47109

Merged
merged 2 commits into from Oct 19, 2018
Merged

yum/dnf: fail when space separated string of names #47109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1143f34
yum/dnf: fail when space separated string of names
mkrizek Oct 16, 2018
1e0d121
Groups allow spaces in names
mkrizek Oct 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/ansible/module_utils/yumdnf.py
View file
Open in desktop
Expand Up @@ -98,6 +98,15 @@ def __init__(self, module):
self.enablerepo = self.listify_comma_sep_strings_in_list(self.enablerepo)
self.exclude = self.listify_comma_sep_strings_in_list(self.exclude)

# Fail if someone passed a space separated string
# https://github.com/ansible/ansible/issues/46301
if any((' ' in name and '@' not in name for name in self.names)):
module.fail_json(
msg='It appears that a space separated string of packages was passed in '
'as an argument. To operate on several packages, pass a comma separated '
'string of packages or a list of packages.'
)

# This should really be redefined by both the yum and dnf module but a
# default isn't a bad idea
self.lockfile = '/var/run/yum.pid'
Expand Down
5 changes: 3 additions & 2 deletions lib/ansible/modules/packaging/os/dnf.py
View file
Open in desktop
Expand Up @@ -26,9 +26,10 @@
options:
name:
description:
- "A list of package names, or package specifier with version, like C(name-1.0)
- "A package name or package specifier with version, like C(name-1.0).
When using state=latest, this can be '*' which means run: dnf -y update.
You can also pass a url or a local path to a rpm file."
You can also pass a url or a local path to a rpm file.
To operate on several packages this can accept a comma separated string of packages or a list of packages."
required: true
aliases:
- pkg
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/modules/packaging/os/yum.py
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@
See the C(allow_downgrade) documentation for caveats with downgrading packages.
- When using state=latest, this can be C('*') which means run C(yum -y update).
- You can also pass a url or a local path to a rpm file (using state=present).
To operate on several packages this can accept a comma separated list of packages or (as of 2.0) a list of packages.
To operate on several packages this can accept a comma separated string of packages or (as of 2.0) a list of packages.
aliases: [ pkg ]
exclude:
description:
Expand Down