Skip to content

chore: log failure detail of source update check #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhaohuiw42 merged 1 commit into from
Mar 24, 2026
Merged

chore: log failure detail of source update check #339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/lastore-daemon/manager_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func prepareUpdateSource() {

}

func (m *Manager) beforeUpdateSourceEnvCheck() bool {
func (m *Manager) beforeUpdateSourceEnvCheck() (bool, string) {
supportArchs, err := system.SystemArchitectures()
if err != nil {
m.updatePlatform.PostProcessEventMessage(updateplatform.ProcessEvent{
Expand All @@ -60,7 +60,7 @@ func (m *Manager) beforeUpdateSourceEnvCheck() bool {
EventStatus: false,
EventContent: err.Error(),
})
return false
return false, err.Error()
}
installedMap, err := loadPkgStatusVersion()
if err != nil {
Expand All @@ -70,7 +70,7 @@ func (m *Manager) beforeUpdateSourceEnvCheck() bool {
EventStatus: false,
EventContent: err.Error(),
})
return false
return false, err.Error()
}

cmd := exec.Command("dpkg", "--audit")
Expand All @@ -81,7 +81,7 @@ func (m *Manager) beforeUpdateSourceEnvCheck() bool {
EventStatus: false,
EventContent: err.Error(),
})
return false
return false, err.Error()
}

var errMsgBuilder strings.Builder
Expand Down Expand Up @@ -119,7 +119,7 @@ func (m *Manager) beforeUpdateSourceEnvCheck() bool {
EventStatus: status,
EventContent: errMsg,
})
return status
return status, errMsg
}

// updateSource 检查更新主要步骤:1.从更新平台获取数据并解析;2.apt update;3.最终可更新内容确定(模拟安装的方式);4.数据上报;
Expand Down Expand Up @@ -219,11 +219,12 @@ func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) {
m.updateSourceOnce = true
m.PropsMu.Unlock()
if len(m.UpgradableApps) > 0 {
if m.config.IntranetUpdate && !m.beforeUpdateSourceEnvCheck() {
status, msg := m.beforeUpdateSourceEnvCheck()
if m.config.IntranetUpdate && !status {
job.retry = 0
return &system.JobError{
ErrType: system.ErrorDpkgError,
ErrDetail: "before update env check failed",
ErrDetail: fmt.Sprintf("before update env check failed: %s", msg),
}
}

Expand Down
Loading