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

don't restrict disable_excludes choices incorrectly (#47453)

Browse source 
* don't restrict disable_excludes choices incorrectly

Fixes #47085

Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2018-10-23 11:39:55 -05:00 committed by GitHub
parent fb2e838a42
commit 0e3e646189
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/dnfyum-disable-excludes.yaml Normal file
View file

@ -0,0 +1,3 @@
---
minor_changes:
- "dnf appropriately handles disable_excludes repoid argument"

2
lib/ansible/module_utils/yumdnf.py
View file

@ -24,7 +24,7 @@ yumdnf_argument_spec = dict(
autoremove=dict(type='bool', default=False), autoremove=dict(type='bool', default=False),
bugfix=dict(required=False, type='bool', default=False), bugfix=dict(required=False, type='bool', default=False),
conf_file=dict(type='str'), conf_file=dict(type='str'),
disable_excludes=dict(type='str', default=None, choices=['all', 'main', 'repoid']), disable_excludes=dict(type='str', default=None),
disable_gpg_check=dict(type='bool', default=False), disable_gpg_check=dict(type='bool', default=False),
disable_plugin=dict(type='list', default=[]), disable_plugin=dict(type='list', default=[]),
disablerepo=dict(type='list', default=[]), disablerepo=dict(type='list', default=[]),

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

@ -142,7 +142,6 @@ options:
- If set to C(all), disables all excludes. - If set to C(all), disables all excludes.
- If set to C(main), disable excludes defined in [main] in yum.conf. - If set to C(main), disable excludes defined in [main] in yum.conf.
- If set to C(repoid), disable excludes defined for given repo id. - If set to C(repoid), disable excludes defined for given repo id.
choices: [ all, main, repoid ]
version_added: "2.7" version_added: "2.7"
validate_certs: validate_certs:
description: description:

1
lib/ansible/modules/packaging/os/yum.py
View file

@ -175,7 +175,6 @@ options:
- If set to C(all), disables all excludes. - If set to C(all), disables all excludes.
- If set to C(main), disable excludes defined in [main] in yum.conf. - If set to C(main), disable excludes defined in [main] in yum.conf.
- If set to C(repoid), disable excludes defined for given repo id. - If set to C(repoid), disable excludes defined for given repo id.
choices: [ all, main, repoid ]
version_added: "2.7" version_added: "2.7"
download_only: download_only:
description: description: