[PR #4964/e2426707 backport][stable-5] Fix keyring_info when using keyring library #4991
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a backport of PR #4964 as merged into main (e242670).
SUMMARY
The docs say this module works with the
keyring
library, but actually this line was clobbering any passphrase retrieved from that library, making it useless on any system without the alternate method (gnome-keyring).After this change, it'll only use the alternate method if the first one didn't work, so the return value from the first one will actually get passed through.
ISSUE TYPE
COMPONENT NAME
keyring_info
ADDITIONAL INFORMATION
Reproduction:
before the change
after the change