-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
libkb: don't error out on PGP keys that don't import properly #1766
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
Contributor
maxtaco
commented
Jan 18, 2016
- Fix two ways:
- don't error out on failed ParseGenericKey
- don't error out on ReadKeyRing in OpenPGP (via vendored openpgp: ignore out-of-place signatures on subkeys go-crypto#7)
- Also contextify more of keyfamily.go
r? @oconnor663 |
G.Log.Debug("- ParseKeyFamily -> %s", ErrToOk(err)) | ||
}() | ||
func ParseKeyFamily(g *GlobalContext, jw *jsonw.Wrapper) (ret *KeyFamily, err error) { | ||
g.Trace("ParseKeyFamily", func() error { return err })() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How does this work? It looks like it logs the exit line immediately instead of deferring it?
Thanks for doing all the contextifying. Looks good, just the one question above. |
- Fix two ways: - don't error out on failed ParseGenericKey - don't error out on ReadKeyRing in OpenPGP (via vendored keybase/go-crypto#7) - Also contextify more of keyfamily.go
- update changelog
maxtaco
force-pushed
the
maxtaco/CORE-2343
branch
from
January 18, 2016 19:57
d7fcc52
to
1247da2
Compare
maxtaco
added a commit
that referenced
this pull request
Jan 18, 2016
libkb: don't error out on PGP keys that don't import properly
jzila
pushed a commit
that referenced
this pull request
Jan 5, 2019
Suggested by jzila. Issue: #1766
jzila
pushed a commit
that referenced
this pull request
Jan 5, 2019
To better handle the dirData undo function. Suggested by jzila. Issue: #1766
jzila
pushed a commit
that referenced
this pull request
Jan 5, 2019
Suggested by songgao. Issue: #1766
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.