From e4380f52938cdb8bc201cfd01514b1e2dc4e6912 Mon Sep 17 00:00:00 2001 From: luoxueyi Date: Fri, 24 Dec 2021 09:55:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/SystemUpdater/UpdateManager.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/SystemUpdater/UpdateManager.py b/backend/SystemUpdater/UpdateManager.py index 2c179e3..15ea1f1 100644 --- a/backend/SystemUpdater/UpdateManager.py +++ b/backend/SystemUpdater/UpdateManager.py @@ -657,15 +657,21 @@ class UpdateManager(): def _gen_noSatisfyList(self, depends, deb_cache): _noSatisfyList = [] + _group_satify = False for or_group in depends: for deb in or_group: debname,ver,oper = deb + if ":" in debname: + debname=debname.split(":")[0] try: pkg = deb_cache[debname] - if not pkg.installed or not apt_pkg.check_dep(pkg.installed.source_version, oper, ver): - _noSatisfyList.append(or_group) + if pkg.installed and apt_pkg.check_dep(pkg.installed.source_version, oper, ver) and _group_satify == False: + _group_satify = True except Exception as e: logging.error(str(e)) + if _group_satify == False and or_group not in _noSatisfyList: + _noSatisfyList.append(or_group) + _group_satify = False return _noSatisfyList From bb6e62081df06bc39d145b5091db06ec0892e4db Mon Sep 17 00:00:00 2001 From: luoxueyi Date: Fri, 24 Dec 2021 10:34:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/SystemUpdater/UpdateManager.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/SystemUpdater/UpdateManager.py b/backend/SystemUpdater/UpdateManager.py index 5839835..da4d6ea 100644 --- a/backend/SystemUpdater/UpdateManager.py +++ b/backend/SystemUpdater/UpdateManager.py @@ -624,6 +624,9 @@ class UpdateManager(): # 需要降级 try: pkg = deb_cache[debname.split('_')[0]] + # 判断":"在版本号中的情况 + if "%3a" in debname: + debname=debname.replace("%3a",":") if pkg.is_installed and pkg.installed.source_version > debname.split('_')[1]: logging.info("Downgrade deb %s, from %s to %s.",\ debname.split('_')[0], pkg.installed.source_version,debname.split('_')[1]) From 650b8d4004ddcdc3d3b297a35b9e16c507b7c504 Mon Sep 17 00:00:00 2001 From: luoxueyi Date: Fri, 24 Dec 2021 10:35:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=80=8E=E5=8A=A0=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E4=BE=9D=E8=B5=96python3-distro-info?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index f43ef69..0a2c319 100644 --- a/debian/control +++ b/debian/control @@ -53,6 +53,7 @@ Depends: ${python3:Depends}, python3-gi (>= 3.8), python3-yaml, aptdaemon, + python3-distro-info, ukui-control-center (>= 3.1.1+1103) Breaks: Recommends: python3-launchpadlib From c501b5ba3db77746f2ffd89a828cac1b9b11b984 Mon Sep 17 00:00:00 2001 From: luoxueyi Date: Fri, 24 Dec 2021 10:40:15 +0800 Subject: [PATCH 4/4] version:1.3.2.1 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index b3b8050..5965147 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +kylin-system-updater (1.3.2.1kord) v101; urgency=medium + + * BUG: 无 + * 需求号: 无 + * 其他改动说明: 增加运行依赖python3-distro-info + * 其他改动影响域:系统更新插件 + + -- luoxueyi Fri, 24 Dec 2021 10:36:19 +0800 + kylin-system-updater (1.3.2kord) v101; urgency=medium * BUG: 无