From bed7620366389a2927da832614e62ee454edfef0 Mon Sep 17 00:00:00 2001 From: wangsong Date: Tue, 2 Nov 2021 10:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/SystemUpdater/UpdateManager.py | 4 ++-- .../backend/InstallBackendAptdaemon.py | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/backend/SystemUpdater/UpdateManager.py b/backend/SystemUpdater/UpdateManager.py index ba761ab..11bfd5a 100644 --- a/backend/SystemUpdater/UpdateManager.py +++ b/backend/SystemUpdater/UpdateManager.py @@ -197,14 +197,14 @@ class UpdateManager(): "message:\n") + str(e) _success = False return _success,header,desc - - self.update_list = UpdateList(self) #更新important.list if self.options.no_update_source is False: _success,header,desc = self.dbusController._on_update_important_list() if _success == False: return _success,header,desc + + self.update_list = UpdateList(self) #检查更新分组配置表 _success,header,desc = self.check_group_config(self.cache) diff --git a/backend/SystemUpdater/backend/InstallBackendAptdaemon.py b/backend/SystemUpdater/backend/InstallBackendAptdaemon.py index 8b0df80..916b501 100644 --- a/backend/SystemUpdater/backend/InstallBackendAptdaemon.py +++ b/backend/SystemUpdater/backend/InstallBackendAptdaemon.py @@ -194,9 +194,10 @@ class InstallBackendAptdaemon(InstallBackend): if action == self.ACTION_UPDATE: # 更新进度100后推迟发出100%的信号 -- 等待源过滤完成 if progress != 100: self.window_main.dbusController.UpdateDetectStatusChanged(self.trans_progress,self.trans_status) - else: - if progress >= 50 and action != self.ACTION_DOWNLOADONLY: + elif action == self.ACTION_INSTALL: + if progress >= 50: LockedPreventShutdown() + #升级的时候发送状态信号时需要上传更新组信息self.upgrade_groups_list upgrade_content = self.now_upgrade.upgrade_groups+self.now_upgrade.single_pkgs self.window_main.dbusController.UpdateDloadAndInstStaChanged(upgrade_content,self.trans_progress,self.trans_status,self.details) @@ -209,12 +210,12 @@ class InstallBackendAptdaemon(InstallBackend): if action == self.ACTION_UPDATE: # 更新进度100后推迟发出100%的信号 -- 等待源过滤完成 if self.trans_progress != 100: self.window_main.dbusController.UpdateDetectStatusChanged(self.trans_progress,self.trans_status) - elif action == self.ACTION_INSTALL and action == self.ACTION_INSTALL_DEB: - #升级的时候发送状态信号时需要上传更新组信息self.upgrade_groups_list + elif action == self.ACTION_INSTALL: + #此处发不发信号一样 频率很低 upgrade_content = self.now_upgrade.upgrade_groups+self.now_upgrade.single_pkgs self.window_main.dbusController.UpdateDloadAndInstStaChanged(upgrade_content,self.trans_progress,self.trans_status,self.details) - elif action == self.ACTION_DOWNLOADONLY: - pass + # elif action == self.ACTION_DOWNLOADONLY: + # pass def _on_details_changed(self, trans, details): self.details = details