Update errored subkey dumping with primary's keyid. #1169
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rrrooommmaaa
requested changes
Jun 8, 2020
src/librekey/rnp_key_store.cpp
Outdated
| @@ -438,6 +438,7 @@ rnp_key_store_add_subkey(rnp_key_store_t *keyring, pgp_key_t *srckey, pgp_key_t | |||
| /* in case we already have key let's merge it in */ | |||
| if (!rnp_key_store_merge_subkey(oldkey, srckey, primary)) { | |||
| RNP_LOG_KEY("failed to merge subkey %s", srckey); | |||
| RNP_LOG_KEY("primary key %s", primary); | |||
There was a problem hiding this comment.
Let's do "primary key is %s" as in other places
There was a problem hiding this comment.
@rrrooommmaaa Thanks, fixed and force-pushed.
dewyatt
approved these changes
Jun 8, 2020
ni4
force-pushed
the
ni4-update-errored-key-dumping
branch
from
88721d4
to
2730040
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 PR updates #1166. It appears that during troubleshooting it's not easy to locate primary key's id using the GnuPG/other tools.