mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
* Fix keyring_info when using keyring library
This line used to always clobber the passphrase retrieved via the `keyring` library, making it useless on everything except gnome-keyring. After this change, it'll only use the alternate method if the default one didn't work.
* delete whitespace
* add changelog fragment
* Update changelogs/fragments/4964-fix-keyring-info.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit e2426707e2
)
Co-authored-by: Sargun Vohra <sargun.vohra@gmail.com>
This commit is contained in:
parent
303000c1a1
commit
29e7fae303
2 changed files with 5 additions and 1 deletions
2
changelogs/fragments/4964-fix-keyring-info.yml
Normal file
2
changelogs/fragments/4964-fix-keyring-info.yml
Normal file
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- "keyring_info - fix the result from the keyring library never getting returned (https://github.com/ansible-collections/community.general/pull/4964)."
|
|
@ -122,6 +122,8 @@ def run_module():
|
|||
pass
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
if passphrase is None:
|
||||
passphrase = _alternate_retrieval_method(module)
|
||||
|
||||
if passphrase is not None:
|
||||
|
|
Loading…
Reference in a new issue