From 70bfcfef42578079f211d87cddc49519ee3503dc Mon Sep 17 00:00:00 2001 From: Moritz Poldrack Date: Sun, 31 Jul 2022 15:15:27 +0200 Subject: lint: work nicely with wrapped errors (errorlint) Error wrapping as introduced in Go 1.13 adds some additional logic to use for comparing errors and adding information to it. Signed-off-by: Moritz Poldrack Acked-by: Robin Jarry --- lib/crypto/pgp/pgp.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/crypto/pgp/pgp.go') diff --git a/lib/crypto/pgp/pgp.go b/lib/crypto/pgp/pgp.go index 579395f9..689bae3f 100644 --- a/lib/crypto/pgp/pgp.go +++ b/lib/crypto/pgp/pgp.go @@ -33,7 +33,7 @@ func (m *Mail) Init() error { logging.Infof("Initializing PGP keyring") err := os.MkdirAll(path.Join(xdg.DataHome(), "aerc"), 0o700) if err != nil { - return fmt.Errorf("failed to create data directory: %v", err) + return fmt.Errorf("failed to create data directory: %w", err) } lockpath := path.Join(xdg.DataHome(), "aerc", "keyring.lock") @@ -290,16 +290,16 @@ func (m *Mail) ExportKey(k string) (io.Reader, error) { pks := bytes.NewBuffer(nil) err = entity.Serialize(pks) if err != nil { - return nil, fmt.Errorf("pgp: error exporting key: %v", err) + return nil, fmt.Errorf("pgp: error exporting key: %w", err) } pka := bytes.NewBuffer(nil) w, err := armor.Encode(pka, "PGP PUBLIC KEY BLOCK", map[string]string{}) if err != nil { - return nil, fmt.Errorf("pgp: error exporting key: %v", err) + return nil, fmt.Errorf("pgp: error exporting key: %w", err) } _, err = w.Write(pks.Bytes()) if err != nil { - return nil, fmt.Errorf("pgp: error exporting key: %v", err) + return nil, fmt.Errorf("pgp: error exporting key: %w", err) } w.Close() return pka, nil -- cgit