Skip to content

Commit 8a6a977

Browse files
electricfacefly602
authored andcommitted
Fix build failure on Go 1.24.6
- Replace `fmt.Errorf` with `errors.New` in multiple files for error returns - Fix incorrect string concatenation in `fmt.Errorf` within service_trigger/service.go; use proper formatting parameters instead --- fix: 修复go 1.24.6 版本编译失败问题 - 将多个文件中错误返回由 fmt.Errorf 改为 errors.New - 修正 service_trigger/service.go 中 fmt.Errorf 格式化字符串拼接错误,改为正确的格式化参数传入 Log: 修复go 1.24.6 版本编译失败问题 Influence: 无
1 parent d0d1ed0 commit 8a6a977

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

accounts1/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func checkAuth(actionId string, sysBusName string) error {
184184
}
185185
}
186186
}
187-
return fmt.Errorf(ErrCodeAuthFailed.String())
187+
return errors.New(ErrCodeAuthFailed.String())
188188
}
189189
return nil
190190
}

bin/user-config/config_datas.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package main
66

77
import (
88
"bufio"
9+
"errors"
910
"fmt"
1011
"os"
1112
"os/exec"
@@ -236,7 +237,7 @@ func getDefaultLang() string {
236237
func doAction(cmd string) error {
237238
out, err := exec.Command("/bin/sh", "-c", cmd).CombinedOutput()
238239
if err != nil {
239-
return fmt.Errorf(string(out))
240+
return errors.New(string(out))
240241
}
241242

242243
return nil

inputdevices1/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package inputdevices
66

77
import (
8-
"fmt"
8+
"errors"
99
"os/exec"
1010

1111
"github.com/linuxdeepin/dde-daemon/common/dconfig"
@@ -149,7 +149,7 @@ func isItemInList(item string, list []string) bool {
149149
func doAction(cmd string) error {
150150
out, err := exec.Command("/bin/sh", "-c", cmd).CombinedOutput()
151151
if err != nil {
152-
return fmt.Errorf(string(out))
152+
return errors.New(string(out))
153153
}
154154
return nil
155155
}

service_trigger/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (service *Service) getDBusMatchRule() string {
5656

5757
func (service *Service) check() error {
5858
if service.Monitor.Type != "DBus" {
59-
return fmt.Errorf("unknown Monitor.Type %q" + service.Monitor.Type)
59+
return fmt.Errorf("unknown Monitor.Type %q", service.Monitor.Type)
6060
}
6161

6262
if service.Monitor.Type == "DBus" {

0 commit comments

Comments
 (0)