mirror of
https://github.com/wneessen/go-mail.git
synced 2024-11-22 13:50:49 +01:00
Merge pull request #120 from wneessen/fix/119_golangci-lint-returns-errors
Make golangci-lint happy again
This commit is contained in:
commit
cb9bec4a6f
1 changed files with 8 additions and 0 deletions
|
@ -86,6 +86,10 @@ func NewClient(conn net.Conn, host string) (*Client, error) {
|
||||||
_, _, err := text.ReadResponse(220)
|
_, _, err := text.ReadResponse(220)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if cerr := text.Close(); cerr != nil {
|
if cerr := text.Close(); cerr != nil {
|
||||||
|
// Since we are being Go <1.20 compatible, we can't combine errorrs and
|
||||||
|
// duplicate %w vers are not suppored. Therefore let's ignore this linting
|
||||||
|
// error for now
|
||||||
|
// nolint:errorlint
|
||||||
return nil, fmt.Errorf("%w, %s", err, cerr)
|
return nil, fmt.Errorf("%w, %s", err, cerr)
|
||||||
}
|
}
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -204,6 +208,10 @@ func (c *Client) Auth(a Auth) error {
|
||||||
mech, resp, err := a.Start(&ServerInfo{c.serverName, c.tls, c.auth})
|
mech, resp, err := a.Start(&ServerInfo{c.serverName, c.tls, c.auth})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if qerr := c.Quit(); qerr != nil {
|
if qerr := c.Quit(); qerr != nil {
|
||||||
|
// Since we are being Go <1.20 compatible, we can't combine errorrs and
|
||||||
|
// duplicate %w vers are not suppored. Therefore let's ignore this linting
|
||||||
|
// error for now
|
||||||
|
// nolint:errorlint
|
||||||
return fmt.Errorf("%w, %s", err, qerr)
|
return fmt.Errorf("%w, %s", err, qerr)
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Reference in a new issue