修改冲突

2021-09-14 10:22:06 +08:00 · 2021-09-14 10:22:06 +08:00 · ae4137a9e7
parent fa34fbd119 6ca3d2287b
commit ae4137a9e7
1 changed files with 7 additions and 3 deletions
--- a/UpdateManager/UpdateManagerDbus.py
+++ b/UpdateManager/UpdateManagerDbus.py
@ -110,10 +110,14 @@ class UpdateManagerDbusController(dbus.service.Object):
            return False,e

    # 取消transaction 
-    @dbus.service.method(INTERFACE, out_signature='b')
+    @dbus.service.method(INTERFACE, out_signature='bs')
    def CancelDownload(self):
-        self.transaction.cancel()
-        return True
+        try:
+            if self.transaction.cancellable == True:
+                self.transaction.cancel()
+        except Exception as e:
+            return (False,str(e))
+        return (True,"success")
    
    #更新进度信息 0~100 进度信息 101为非预期的信号
    @dbus.service.signal(INTERFACE,signature='is')