Skip to content
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
merged 4 commits into from
Jan 18, 2016

Conversation

maxtaco
Copy link
Contributor

@maxtaco maxtaco commented Jan 18, 2016

@maxtaco
Copy link
Contributor Author

maxtaco commented Jan 18, 2016

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 })()
Copy link
Contributor

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?

@oconnor663
Copy link
Contributor

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 added a commit that referenced this pull request Jan 18, 2016
libkb: don't error out on PGP keys that don't import properly
@maxtaco maxtaco merged commit a6d873e into master Jan 18, 2016
@maxtaco maxtaco deleted the maxtaco/CORE-2343 branch January 18, 2016 21:09
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants