openkylin
/
kylin-system-updater
mirror of https://gitee.com/openkylin/kylin-system-updater.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent 80784676e2 795b672b3b
commit 1d3a330b7a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/SystemUpdater/UpdateManager.py
View File

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