From 11db60206eb41276d8fdc6476aa1cab70a2d1cce Mon Sep 17 00:00:00 2001 From: Xueyi Luo Date: Thu, 5 May 2022 16:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9SYSTEM=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/SystemUpdater/Core/Database.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/backend/SystemUpdater/Core/Database.py b/backend/SystemUpdater/Core/Database.py index 8584817..a3ba43f 100644 --- a/backend/SystemUpdater/Core/Database.py +++ b/backend/SystemUpdater/Core/Database.py @@ -203,9 +203,11 @@ class Sqlite3Server(object): json_file = json.dumps(InstallInfos.copy()) self.window_main.collector.UpdateMsg("InstallInfos", json_file) # 系统升级完成 ..判断版本号 - if status == "success" and "kylin-update-desktop-system" in pkg_group: + if status == "success" and "kylin-update-desktop-system" in pkgname: # 更新版本号 - self._refresh_system_version() + if "=" in str(pkgversion): + version = str(pkgversion).split('=')[-1] + self._refresh_system_version(version) elif pkg_list: # 单包更新 # 获取单包数据插入数据库 pkgname = pkg_list.pop(0) @@ -344,7 +346,7 @@ class Sqlite3Server(object): # 系统升级完成 ..判断版本号 if status == "success" and "kylin-update-desktop-system" in pkg_group: # 更新版本号 - self._refresh_system_version() + self._refresh_system_version(str(pkgversion)) elif mode == InstallBackend.MODE_INSTALL_SYSTEM: # 全盘升级 self.insert_into_updateinfo(str("Upgrade System"), "", "This is a complete system upgrade, equivalent to the implementation of apt dist-upgrade", timestr, status, "1", errstr) @@ -429,13 +431,11 @@ class Sqlite3Server(object): except Exception as e: logging.error(str(e)) - def _refresh_system_version(self): + def _refresh_system_version(self, version=''): try: - #初始化系统版本号:version - version_path = "/etc/kylin-version/kylin-system-version.conf" - if os.path.isfile(version_path): - version = UpgradeConfig(datadir = "/etc/kylin-version/", name = "kylin-system-version.conf").getWithDefault("SYSTEM", "version", " ") - self.ucconfigs.setValue("SYSTEM","version",str(version),True) + #刷新系统版本号:version + version = version.strip() + self.ucconfigs.setValue("SYSTEM","version",str(version),True) version = "" #初始化系统版本号:kylin_release_id version_path = "/etc/os-release" @@ -445,7 +445,8 @@ class Sqlite3Server(object): for line in lines: if "KYLIN_RELEASE_ID" in line: version = line.split('=')[1] - self.ucconfigs.setValue("SYSTEM","kylin_release_id",str(version),True) + if len(version) != 0: + self.ucconfigs.setValue("SYSTEM","kylin_release_id",str(version),True) except Exception as e: logging.error(str(e))