openkylin
/
kylin-system-updater
mirror of https://gitee.com/openkylin/kylin-system-updater.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'backend_dev' of http://gitlab2.kylin.com/kylin-desktop/update-manager-group/kylin-system-updater into backend_dev

This commit is contained in:
luoxueyi 2021-11-05 11:06:36 +08:00
parent 2239bd86ed 2ed38648e2
commit 207e0c9293
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/SystemUpdater/UpdateManager.py
View File

@ -167,10 +167,8 @@ class UpdateManager():
return
else:
upgrade_list = []
trans_status = get_status_string_from_enum('status-finished')
if self.update_list != None:
upgrade_list = self.update_list.local_upgrade_data.upgrade_groups + self.update_list.local_upgrade_data.single_pkgs
self.dbusController.UpdateDetectStatusChanged(100,trans_status)
#发送更新升级列表完成的标志
self.dbusController.UpdateDetectFinished(_success,upgrade_list,header,desc)
#检查安装完成之后需要重启吗

3
backend/SystemUpdater/backend/__init__.py
View File

@ -344,16 +344,13 @@ class InstallBackend():
self.window_main.sqlite3_server.insert_info(self.now_upgrade.upgrade_mode,self.now_upgrade.single_pkgs,self.now_upgrade.upgrade_groups,success,error_string,error_desc)
self.window_main.dbusController.UpdateInstallFinished(success,upgrade_content,error_string,error_desc)
elif action == self.ACTION_UPDATE:
trans_status = get_status_string_from_enum('status-finished')
if success:
#开始生成列表
self.window_main.start_available()
elif error_string or error_desc:
self.window_main.dbusController.UpdateDetectStatusChanged(100,trans_status)
logging.warning(error_string + error_desc)
self.window_main.dbusController.UpdateDetectFinished(success,[],error_string,error_desc)
else:
self.window_main.dbusController.UpdateDetectStatusChanged(100,trans_status)
self.window_main.dbusController.UpdateDetectFinished(success,[],'','')
elif action == self.ACTION_DOWNLOADONLY:
if success: