Merge branch 'backend_manual' of gitlab2.kylin.com:kylinos-src/update-manager-group/kylin-system-updater into backend_manual

This commit is contained in:
wangsong 2022-10-25 10:32:04 +08:00
commit 1d3a330b7a
1 changed files with 4 additions and 3 deletions

View File

@ -748,7 +748,7 @@ class UpdateManager():
logging.warning("The cache has no package named '%s', this is a virtual package...", debname)
providers = deb_cache.get_providing_packages(debname)
# hear!
if len(providers) != 1:
if len(providers) < 1:
logging.error("Can not found depend %s.", debname)
continue
depname = providers[0].name
@ -762,8 +762,9 @@ class UpdateManager():
_group_satify = True
else:
pkg = deb_cache[debname]
if (pkg.installed and apt_pkg.check_dep(pkg.installed.version, oper, ver)) or (not pkg.installed and apt_pkg.check_dep(pkg.candidate.version, oper, ver)) and _group_satify == False:
_group_satify = True
if (apt_pkg.check_dep(pkg.candidate.source_version, oper, ver)) or (pkg.installed and apt_pkg.check_dep(pkg.installed.version, oper, ver)) or (not pkg.installed and apt_pkg.check_dep(pkg.candidate.version, oper, ver)) and _group_satify == False:
# if not apt_pkg.check_dep(cand, oper, ver): #no candidate
_group_satify = True
except Exception as e:
logging.error(str(e))
if _group_satify == False and or_group not in _noSatisfyList: