From eb474b2a9f1eff95006ee14896441f5a50eaa2f5 Mon Sep 17 00:00:00 2001 From: wangsong Date: Fri, 12 Aug 2022 09:52:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=9A=84=E7=A8=8B=E5=BA=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/SystemUpdater/UpdateManagerDbus.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/SystemUpdater/UpdateManagerDbus.py b/backend/SystemUpdater/UpdateManagerDbus.py index cb58bd0..cfe3ee1 100755 --- a/backend/SystemUpdater/UpdateManagerDbus.py +++ b/backend/SystemUpdater/UpdateManagerDbus.py @@ -120,11 +120,11 @@ class UpdateManagerDbusController(dbus.service.Object): obj = self.bus.get_object("org.freedesktop.NetworkManager","/org/freedesktop/NetworkManager") interface = dbus.Interface(obj, "org.freedesktop.NetworkManager") retval = interface.CheckConnectivity(timeout=0.5) - #1 表示没有网卡可以使用 - if retval == 1: - raise UpdateBaseError(enums.ERROR_NETWORK_FAILED) except Exception: - pass + retval = 4 + #1 表示没有网卡可以使用 + if retval == 1: + raise UpdateBaseError(enums.ERROR_NETWORK_FAILED) def _check_prohibit_user(self, sender_name): prohibit_list = ["dbus-send","gdbus"] From 89c203b2ca4a8b1a08bf8bac484800a128b78023 Mon Sep 17 00:00:00 2001 From: wangsong Date: Fri, 12 Aug 2022 15:16:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=98=E5=85=88?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B2=A1=E6=9C=89=E5=AE=89=E8=A3=85=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/SystemUpdater/UpdateManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/SystemUpdater/UpdateManager.py b/backend/SystemUpdater/UpdateManager.py index dc9ff2d..fd8c538 100644 --- a/backend/SystemUpdater/UpdateManager.py +++ b/backend/SystemUpdater/UpdateManager.py @@ -340,7 +340,7 @@ class UpdateManager(): else: logging.info("Check: (%s:%s) No need to upgrade and duo to not pust...",pkg_name,self_pkg.installed.source_version) else: - logging.info("Check: (%s:%s) No need to upgrade...",pkg_name,self_pkg.installed.source_version) + logging.info("Check: (%s) Not to be installed...",pkg_name) else: logging.error("Check: (%s) The upgrade package is not in Cache...",pkg_name) From 5b5c013734dcd07315449a4192c75cd681f875bc Mon Sep 17 00:00:00 2001 From: wangsong Date: Tue, 16 Aug 2022 16:42:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=BC=BA=E5=B0=91=E4=BE=9D=E8=B5=96=E7=9A=84?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=92=8C=E8=AE=A1=E7=AE=97=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E7=9A=84=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/SystemUpdater/backend/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/SystemUpdater/backend/__init__.py b/backend/SystemUpdater/backend/__init__.py index c10c63d..4a422e9 100644 --- a/backend/SystemUpdater/backend/__init__.py +++ b/backend/SystemUpdater/backend/__init__.py @@ -537,6 +537,9 @@ class InstallBackend(): auto = pkg_cache.is_auto_installed pkg_cache.mark_auto(auto) + if pkg_cache.marked_keep == True: + pkg_cache.mark_install(False, False, True) + resolver.clear(pkg_cache) resolver.protect(pkg_cache) #出现破损的原因有 升级一个包需要安装其他的包或者需要删除其他的软件包 From da72128039e909c5f0ef812ae598c71991e4172f Mon Sep 17 00:00:00 2001 From: wangsong Date: Tue, 16 Aug 2022 17:35:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/SystemUpdater/backend/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/SystemUpdater/backend/__init__.py b/backend/SystemUpdater/backend/__init__.py index 4a422e9..0b3f5e3 100644 --- a/backend/SystemUpdater/backend/__init__.py +++ b/backend/SystemUpdater/backend/__init__.py @@ -530,7 +530,7 @@ class InstallBackend(): pkg_cache = cache[pkg] #将第二个参数调整为False 当为True时就不能检查缺少依赖的包 默认自动移除掉了 - pkg_cache.mark_install(False, False, True) + pkg_cache.mark_install(False, True, True) #将可自动升级的标记为自动安装 if pkg_cache.is_upgradable == True: From e4539540a93c2da5738e89e716fc44dce73b230c Mon Sep 17 00:00:00 2001 From: Xueyi Luo Date: Tue, 16 Aug 2022 17:40:57 +0800 Subject: [PATCH 5/5] version:2.0.5.5 --- debian/changelog | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6dcaa14..3f5615b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,14 @@ -kylin-system-updater (2.0.5.3.1) v101; urgency=medium +kylin-system-updater (2.0.5.5) v101; urgency=medium + + * BUG: #120948 【在线更新】断网时检测更新失败的文案何设计图不符 + # 134470 【设计】安装失败日志语言显示异常 + * 需求号: # 无 + * 其他改动说明: 无 + * 其他改动影响域:系统更新 + + -- luoxueyi Thu, 04 Aug 2022 09:28:58 +0800 + +kylin-system-updater (2.0.5.4) v101; urgency=medium * BUG: #134497 【在线更新】打开设置-更新，自动更新按钮默认是“打开”状态 #134493 【在线更新】【PTOF】更新完成后重启系统，打开设置-更新界面，提示“后台程序未启动”