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

将分组列表合并

This commit is contained in:
wangsong 2021-09-28 13:51:09 +08:00
parent b67818df86
commit 368078058a
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
UpdateManager/UpdateManager.py
View File

@ -143,12 +143,9 @@ class UpdateManager():
if _success == True and header == INSTALL_ALONE_PROGRESS:
return
else:
#组的升级列表
upgrade_groups_list = self.update_list.local_upgrade_list.get('upgrade_groups_list',[])
#单包的升级列表
pkg_important_list = self.update_list.local_upgrade_list.get('pkg_important_list',[])
upgrade_list = self.update_list.local_upgrade_list.get('upgrade_groups_list',[]) + self.update_list.local_upgrade_list.get('pkg_important_list',[])
#发送更新升级列表完成的标志
self.dbusController.UpdateDetectFinished(_success,upgrade_groups_list,pkg_important_list,header,desc)
self.dbusController.UpdateDetectFinished(_success,upgrade_list,header,desc)
#检查安装完成之后需要重启吗
if os.path.exists(REBOOT_REQUIRED_FILE):

8
UpdateManager/UpdateManagerDbus.py
View File

@ -133,10 +133,10 @@ class UpdateManagerDbusController(dbus.service.Object):
logging.info("emit progress = %d , status = %s",progress,status)
#更新完成的信号
@dbus.service.signal(INTERFACE,signature='basasss')
def UpdateDetectFinished(self, success, upgrade_group,upgrade_pkg,error_string='',error_desc='',):
logging.info("emit update success = %r , upgrade_group = %a,upgrade_pkg = %a, error_string = %s , error_desc = %s ",\
success,upgrade_group,upgrade_pkg,error_string,error_desc)
@dbus.service.signal(INTERFACE,signature='basss')
def UpdateDetectFinished(self, success, upgrade_group,error_string='',error_desc='',):
logging.info("emit update success = %r , upgrade_group = %a, error_string = %s , error_desc = %s ",\
success,upgrade_group,error_string,error_desc)
#升级的进度信息 0~100 进度信息 101为非预期的信号
@dbus.service.signal(INTERFACE,signature='asis')

4
UpdateManager/backend/__init__.py
View File

@ -131,9 +131,9 @@ class InstallBackend():
self.window_main.start_available()
elif error_string or error_desc:
logging.warning(error_string + error_desc)
self.window_main.dbusController.UpdateDetectFinished(success,[],[],error_string,error_desc)
self.window_main.dbusController.UpdateDetectFinished(success,[],error_string,error_desc)
else:
self.window_main.dbusController.UpdateDetectFinished(success,[],[],'','')
self.window_main.dbusController.UpdateDetectFinished(success,[],'','')
# try aptdaemon
if os.path.exists("/usr/sbin/aptd") \