Skip to content

fix: Remove features related to the outdated backup and restore system "ab recovery" #294

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
electricface merged 1 commit into from
Jan 22, 2026
Merged

fix: Remove features related to the outdated backup and restore system "ab recovery" #294

Show file tree
Hide file tree
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
7 changes: 1 addition & 6 deletions src/lastore-daemon/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/godbus/dbus/v5"
"github.com/linuxdeepin/dde-api/polkit"
ConfigManager "github.com/linuxdeepin/go-dbus-factory/org.desktopspec.ConfigManager"
abrecovery "github.com/linuxdeepin/go-dbus-factory/system/com.deepin.abrecovery"
accounts "github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.accounts1"
power "github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.power1"
ofdbus "github.com/linuxdeepin/go-dbus-factory/system/org.freedesktop.dbus"
Expand Down Expand Up @@ -92,7 +91,6 @@ type Manager struct {
loginManager login1.Manager
sysDBusDaemon ofdbus.DBus
systemd systemd1.Manager
abObj abrecovery.ABRecovery

grub *grubManager
userAgents *userAgentMap // 闲时退出时，需要保存数据，启动时需要根据uid,agent sender以及session path完成数据恢复
Expand All @@ -108,8 +106,7 @@ type Manager struct {
checkDpkgCapabilityOnce sync.Once
supportDpkgScriptIgnore bool

envIsValid bool
preBackUpCheck bool
envIsValid bool

logFds []*os.File
logFdsMu sync.Mutex
Expand Down Expand Up @@ -140,11 +137,9 @@ func NewManager(service *dbusutil.Service, updateApi system.System, c *config.Co
signalLoop: dbusutil.NewSignalLoop(service.Conn(), 10),
systemd: systemd1.NewManager(service.Conn()),
sysPower: power.NewPower(service.Conn()),
abObj: abrecovery.NewABRecovery(service.Conn()),
securitySourceConfig: make(UpdateSourceConfig),
systemSourceConfig: make(UpdateSourceConfig),
envIsValid: true,
preBackUpCheck: true,
}
m.reloadOemConfig(true)
m.signalLoop.Start()
Expand Down
17 changes: 0 additions & 17 deletions src/lastore-daemon/manager_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,6 @@ func (m *Manager) beforeUpdateSourceEnvCheck() bool {
return flag
}

func (m *Manager) preCheckBackUp() {
canBackup, abErr := m.abObj.CanBackup(0)
if abErr != nil || !canBackup {
logger.Info("can not backup,", abErr)
m.preBackUpCheck = false
}
hasBackedUp, err := m.abObj.HasBackedUp().Get(0)
if err != nil && !hasBackedUp {
abErr = m.abObj.StartBackup(0)
if abErr != nil {
logger.Info("can not backup,", abErr)
m.preBackUpCheck = false
}
}
}

// updateSource 检查更新主要步骤:1.从更新平台获取数据并解析;2.apt update;3.最终可更新内容确定(模拟安装的方式);4.数据上报;
// 任务进度划分: 0-10%-80%-90%-100%
func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) {
Expand Down Expand Up @@ -135,7 +119,6 @@ func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) {
if err != nil {
return nil, err
}
m.preCheckBackUp()
prepareUpdateSource()
m.reloadOemConfig(true)
m.updatePlatform.Token = updateplatform.UpdateTokenConfigFile(m.config.IncludeDiskInfo, m.config.GetHardwareIdByHelper)
Expand Down
Loading