From 368078058ae7535374db30595f6ad09709d309d5 Mon Sep 17 00:00:00 2001
From: wangsong <wangsong@kylinos.cn>
Date: Tue, 28 Sep 2021 13:51:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=88=86=E7=BB=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UpdateManager/UpdateManager.py     | 7 ++-----
 UpdateManager/UpdateManagerDbus.py | 8 ++++----
 UpdateManager/backend/__init__.py  | 4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 67c750d..c6f39b6 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -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):
diff --git a/UpdateManager/UpdateManagerDbus.py b/UpdateManager/UpdateManagerDbus.py
index cdfb654..caeee1e 100755
--- a/UpdateManager/UpdateManagerDbus.py
+++ b/UpdateManager/UpdateManagerDbus.py
@@ -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')
diff --git a/UpdateManager/backend/__init__.py b/UpdateManager/backend/__init__.py
index ec82c61..2aaae5f 100644
--- a/UpdateManager/backend/__init__.py
+++ b/UpdateManager/backend/__init__.py
@@ -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") \