Skip to content

Commit

Permalink
feat: 更新方案变更,去掉dut、ab备份
Browse files Browse the repository at this point in the history
更新方案变更,去掉dut、ab备份

Log: 更新方案变更,去掉dut、ab备份
pms: TASK-362299
  • Loading branch information
fly602 committed Feb 19, 2025
1 parent 434a8ce commit ae93696
Show file tree
Hide file tree
Showing 34 changed files with 118 additions and 1,395 deletions.
2 changes: 1 addition & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Copyright: UnionTech Software Technology Co., Ltd.
License: GPL-3.0-or-later

# configuration file
Files: usr/share/* var/lib/* etc/apt/* lib/systemd/*
Files: usr/share/* var/lib/* etc/* lib/systemd/*
Copyright: UnionTech Software Technology Co., Ltd.
License: GPL-3.0-or-later

Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
lastore-daemon (6.2.7) unstable; urgency=medium

* feat: 更新方案变更,去掉dut

-- fuleyi <fuleyi@uniontech.com> Mon, 17 Feb 2025 14:36:36 +0800

lastore-daemon (6.2.6) stable; urgency=medium

* fix: 修复旧版控制中心无法加入内测的问题 (linuxdeepin#129)
Expand Down
10 changes: 0 additions & 10 deletions lib/systemd/system/lastore-after-upgrade-check.service

This file was deleted.

4 changes: 4 additions & 0 deletions src/internal/config/repo_config.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

package config

import (
Expand Down
4 changes: 4 additions & 0 deletions src/internal/system/command.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

package system

import (
Expand Down
22 changes: 22 additions & 0 deletions src/internal/system/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package system
import (
"bufio"
"encoding/json"
"github.com/linuxdeepin/go-lib/keyfile"
"io"
"os"
"os/exec"
Expand Down Expand Up @@ -273,6 +274,14 @@ const (
)

func IsAuthorized() bool {
edition, err := getEditionName()
if err != nil {
return false
}
// 社区版不需要鉴权
if edition == "Community" {
return true
}
sysBus, err := dbusutil.NewSystemService()
if err != nil {
logger.Warning(err)
Expand Down Expand Up @@ -335,3 +344,16 @@ func CheckLock(p string) (string, bool) {

return "", false
}

func getEditionName() (string, error) {
kf := keyfile.NewKeyFile()
err := kf.LoadFromFile("/etc/os-version")
if err != nil {
return "", err
}
editionName, err := kf.GetString("Version", "EditionName")
if err != nil {
return "", err
}
return editionName, nil
}
56 changes: 0 additions & 56 deletions src/internal/system/dut/common.go

This file was deleted.

214 changes: 0 additions & 214 deletions src/internal/system/dut/dut.go

This file was deleted.

Loading

0 comments on commit ae93696

Please # to comment.