opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-12-02 20:48:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix error handling in mailer and wiki services (#36041) (#36053)

Browse Source 
Backport #36041 by @hamkido

- Updated error message in `incoming.go` to remove unnecessary wrapping
of the error.
- Corrected typo in error message in `wiki.go` for clarity.

Co-authored-by: hamkido <hamki.do2000@gmail.com>
This commit is contained in:
Giteabot
2025-11-29 12:34:38 +08:00
committed by GitHub
parent f164e38e04
commit 46d1d154e8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/mailer/incoming/incoming.go
View File

@@ -6,6 +6,7 @@ package incoming
import ( import (
"context" "context"
"crypto/tls" "crypto/tls"
"errors"
"fmt" "fmt"
net_mail "net/mail" net_mail "net/mail"
"regexp" "regexp"
@@ -221,7 +222,7 @@ loop:
err := func() error { err := func() error {
r := msg.GetBody(section) r := msg.GetBody(section)
if r == nil { if r == nil {
return fmt.Errorf("could not get body from message: %w", err) return errors.New("could not get body from message")
} }
env, err := enmime.ReadEnvelope(r) env, err := enmime.ReadEnvelope(r)

2
services/wiki/wiki.go
View File

@@ -137,7 +137,7 @@ func updateWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model
if hasDefaultBranch { if hasDefaultBranch {
if err := gitRepo.ReadTreeToIndex("HEAD"); err != nil { if err := gitRepo.ReadTreeToIndex("HEAD"); err != nil {
log.Error("Unable to read HEAD tree to index in: %s %v", basePath, err) log.Error("Unable to read HEAD tree to index in: %s %v", basePath, err)
return fmt.Errorf("fnable to read HEAD tree to index in: %s %w", basePath, err) return fmt.Errorf("unable to read HEAD tree to index in: %s %w", basePath, err)
} }
} }