yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1411 from lnussel/pkglistgen

Browse Source 
pkglistgen: use set_namespaceproviders function
This commit is contained in:
Stephan Kulow 2018-02-20 15:19:43 +01:00 committed by GitHub
commit fc7e60bff7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkglistgen.py
View File

@ -553,25 +553,6 @@ class PkgListGen(ToolBase.ToolBase):
self.lockjobs[arch] = []
solvables = set()
def cb(name, evr):
ret = 0
if name == solv.NAMESPACE_MODALIAS:
ret = 1
elif name == solv.NAMESPACE_FILESYSTEM:
ret = 1
elif name == solv.NAMESPACE_LANGUAGE:
if pool.id2str(evr) in self.locales:
ret = 1
else:
logger.warning('unhandled "{} {}"'.format(pool.id2str(name), pool.id2str(evr)))
return ret
if hasattr(pool, 'set_namespacecallback'):
pool.set_namespacecallback(cb)
else:
logger.debug('libsolv missing namespace callback')
for prp in self.repos:
project, reponame = prp.split('/')
repo = pool.add_repo(project)
@ -587,6 +568,13 @@ class PkgListGen(ToolBase.ToolBase):
pool.addfileprovides()
pool.createwhatprovides()
# https://github.com/openSUSE/libsolv/issues/231
if hasattr(pool, 'set_namespaceproviders'):
for l in self.locales:
pool.set_namespaceproviders(solv.NAMESPACE_LANGUAGE, pool.Dep(l), True)
else:
logger.warn('libsolv missing set_namespaceproviders()')
return pool
# parse file and merge all groups