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_manual' of gitlab2.kylin.com:kylin-desktop/update-manager-group/kylin-system-updater into backend_manual

This commit is contained in:
Luoxueyi 2022-09-09 15:40:22 +08:00
parent 06ecd29b1d d2d8a01b28
commit 053334144f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/SystemUpdater/Core/utils.py
View File

@ -468,7 +468,7 @@ def get_config_patch():
if os.path.exists(NOW_UPDATE_CONFIG):
return NOW_UPDATE_CONFIG
elif os.path.exists(OLD_UPDATE_CONFIG):
return OLD_UPDATE_CONFIG
return NOW_UPDATE_CONFIG
else:
return NOW_UPDATE_CONFIG

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

@ -667,6 +667,7 @@ class InstallBackend():
#升级完成后走的分支
if action == self.ACTION_INSTALL:
false_num = 0
self._release_install_lock()
self._send_error_code(error_code)
@ -680,8 +681,10 @@ class InstallBackend():
self.window_main.start_install(self.action_mode,True,self.now_upgrade.upgrade_content)
self.window_main.retry_limit = self.window_main.retry_limit - 1
return
false_num = self._make_insert_info(success,is_cancelled,self.now_upgrade,error_string,error_desc)
try:
false_num = self._make_insert_info(success,is_cancelled,self.now_upgrade,error_string,error_desc)
except Exception as e:
logging.error(e)
if success == False:
logging.info("The number of failed installations or upgrades is %d",false_num)