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

backend/SystemUpdater/UpdateManagerDbus.py

@@ -115,8 +115,10 @@ class UpdateManagerDbusController(dbus.service.Object):
                         sender_keyword="caller_name")
     def Quit(self, caller_name):
         """Request a shutdown of the daemon."""
+        #如果在下载就请求 取消
         self.CancelDownload()
         try:
+            #尝试接触 关闭枷锁
             unLockedEnableShutdown()
         except:
             logging.error("File lock release failure")
@@ -150,7 +152,7 @@ class UpdateManagerDbusController(dbus.service.Object):
         except Exception:
             return False
 
-    #更新的dbus apt install -f
+    #apt install -f
     @dbus.service.method(UPDATER_DBUS_INTERFACE,out_signature='b')
     def FixBrokenDepends(self):
         try:
@@ -195,25 +197,6 @@ class UpdateManagerDbusController(dbus.service.Object):
         except Exception:
             return False
     
-    #全部升级
-    @dbus.service.method(UPDATER_DBUS_INTERFACE,in_signature='b',out_signature='bs')
-    def DistUpgradeAll(self,_is_install):
-        try:
-            is_install = bool(_is_install)
-            if not self.parent.update_list:
-                logging.warning('Perform \"UpdateDetect\" first')
-                return False,'Perform \"UpdateDetect\" first'
-            #处于更新和升级中的话 不进行升级
-            if self.parent.is_working != InstallBackend.ACTION_DEFUALT_STATUS:
-                logging.warning('DistUpgradeAll In the process of updating or Upgrading...')
-                return False,'In the process of updating or Upgrading...'
-            else:
-                logging.info(COLORMETHOR_PREFIX+'method'+COLORLOG_SUFFIX+' DistUpgradeAll and is_install:%r...',is_install)
-                self.parent.start_install(InstallBackend.MODE_UPGRADE_ALL,is_install)
-                return True,'success'
-        except Exception as e:
-            return False,str(e)
-    
     #部分升级
     @dbus.service.method(UPDATER_DBUS_INTERFACE,in_signature='bas',out_signature='bs')
     def DistUpgradePartial(self,_is_install,_partial_upgrade_list):
@@ -243,6 +226,42 @@ class UpdateManagerDbusController(dbus.service.Object):
         except Exception as e:
             return False,e
 
+    #全部升级
+    @dbus.service.method(UPDATER_DBUS_INTERFACE,in_signature='b',out_signature='bs')
+    def DistUpgradeAll(self,_is_install):
+        try:
+            is_install = bool(_is_install)
+            if not self.parent.update_list:
+                logging.warning('Perform \"UpdateDetect\" first')
+                return False,'Perform \"UpdateDetect\" first'
+            #处于更新和升级中的话 不进行升级
+            if self.parent.is_working != InstallBackend.ACTION_DEFUALT_STATUS:
+                logging.warning('DistUpgradeAll In the process of updating or Upgrading...')
+                return False,'In the process of updating or Upgrading...'
+            else:
+                logging.info(COLORMETHOR_PREFIX+'method'+COLORLOG_SUFFIX+' DistUpgradeAll and is_install:%r...',is_install)
+                self.parent.start_install(InstallBackend.MODE_UPGRADE_ALL,is_install)
+                return True,'success'
+        except Exception as e:
+            return False,str(e)
+            
+    # 全盘升级 也就是 apt dist-upgrade 升级的方式
+    @dbus.service.method(UPDATER_DBUS_INTERFACE,in_signature='b',out_signature='bs')
+    def DistUpgradeSystem(self,_is_install):
+        try:
+            is_install = bool(_is_install)
+            #处于更新和升级中的话 不进行升级
+            if self.parent.is_working != InstallBackend.ACTION_DEFUALT_STATUS:
+                logging.warning('DistUpgradeSystem In the process of updating or Upgrading...')
+                return False,'In the process of updating or Upgrading...'
+            else:
+                logging.info(COLORMETHOR_PREFIX+'method'+COLORLOG_SUFFIX+' DistUpgradeSystem and is_install:%r...',is_install)
+                self.parent.start_install(InstallBackend.MODE_UPGRADE_SYSTEM,is_install)
+                return True,'success'
+        except Exception as e:
+            logging.error(False, str(e))
+            return (False, str(e))
+
     #卸载包
     @dbus.service.method(UPDATER_DBUS_INTERFACE,in_signature='as',out_signature='b')
     def PurgePackages(self,_purge_list):
@@ -286,22 +305,6 @@ class UpdateManagerDbusController(dbus.service.Object):
             return status
         return status
 
-    # 全盘升级 也就是 apt dist-upgrade 升级的方式
-    @dbus.service.method(UPDATER_DBUS_INTERFACE,in_signature='b',out_signature='bs')
-    def DistUpgradeSystem(self,_is_install):
-        try:
-            is_install = bool(_is_install)
-            #处于更新和升级中的话 不进行升级
-            if self.parent.is_working != InstallBackend.ACTION_DEFUALT_STATUS:
-                logging.warning('DistUpgradeSystem In the process of updating or Upgrading...')
-                return False,'In the process of updating or Upgrading...'
-            else:
-                logging.info(COLORMETHOR_PREFIX+'method'+COLORLOG_SUFFIX+' DistUpgradeSystem and is_install:%r...',is_install)
-                self.parent.start_install(InstallBackend.MODE_UPGRADE_SYSTEM,is_install)
-                return True,'success'
-        except Exception as e:
-            logging.error(False, str(e))
-            return (False, str(e))
 
     # 安装本地deb包
     @dbus.service.method(UPDATER_DBUS_INTERFACE,in_signature='ssbb',out_signature='b')