Merge branch 'master' of https://github.com/TencentBlueKing/bk-turbo …

…into dev_yanafu
TencentBlueKing · Sep 25, 2024 · d32af23 · d32af23
2 parents 1a9708c + d6a9b5b
commit d32af23
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/backend/booster/bk_dist/controller/pkg/manager/basic/utils.go b/src/backend/booster/bk_dist/controller/pkg/manager/basic/utils.go
@@ -271,7 +271,8 @@ func searchAS(exe string) []string {
 	blog.Infof("basic: ready run cmd:[%s] for exe:%s", cmd, exe)
 	sandbox := dcSyscall.Sandbox{}
 	_, out, _, err := sandbox.ExecScriptsWithMessage(cmd)
-	if err != nil {
+	// 出错，或者只返回了as(没有完整路径，需要从系统得到)
+	if err != nil || strings.TrimSpace(string(out)) == "as" {
 		blog.Warnf("basic: search as with out:%s,error:%+v", out, err)
 
 		cmd = "which as"