Merge branch 'backend_dev' of gitlab2.kylin.com:kylin-desktop/update-manager-group/kylin-system-updater into backend_dev
This commit is contained in:
commit
6a219e8cbe
|
@ -128,9 +128,10 @@ class UpdateListFilterCache(apt.Cache):
|
|||
for pkg in pkg_lists:
|
||||
try:
|
||||
new_ver = ver_in_allowed_origin(pkg, self.allowed_origins)
|
||||
if not pkg.installed: # 判断安装列表
|
||||
if len(new_ver) == 0:
|
||||
continue
|
||||
if _is_adjust and not new_ver:
|
||||
logging.info("< %s > did not find a suitable version..." % pkg.name)
|
||||
continue
|
||||
if not pkg.installed: # 判断安装列表
|
||||
if pkg.candidate == new_ver[0] and pkg not in new_upgrade_pkgs:
|
||||
new_upgrade_pkgs.append(pkg)
|
||||
elif new_ver[0] != pkg.candidate and pkg not in new_upgrade_pkgs:
|
||||
|
@ -150,6 +151,8 @@ class UpdateListFilterCache(apt.Cache):
|
|||
elif nv > pkg.installed and nv == pkg.candidate:
|
||||
new_upgrade_pkgs.append(pkg)
|
||||
break
|
||||
elif _is_adjust == True:
|
||||
logging.info("< %s > did not find a suitable version..." % pkg.name)
|
||||
except NoAllowedOriginError:
|
||||
logging.error("Cannot found allowed version: %s", pkg.name)
|
||||
continue
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
kylin-system-updater (1.2.8.2kord) v101; urgency=medium
|
||||
kylin-system-updater (1.2.9kord) v101; urgency=medium
|
||||
|
||||
* BUG: bug#91191,bug#90533,bug#91103,bug#90454,bug#89871
|
||||
* 需求号: 9002
|
||||
|
|
Loading…
Reference in New Issue