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

Merge pull request #2260 from nilxam/locales_from_attribs

Browse Source 
pkglistgen: fix wrong parsing way on pkglistgen-locale
This commit is contained in:
Max Lin 2019-10-15 20:20:20 +08:00 committed by GitHub
commit 35d7bf0ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkglistgen/tool.py
View File

@ -480,8 +480,7 @@ class PkgListGen(ToolBase.ToolBase):
self.ignore_broken = True
global_use_recommends = not ignore_recommended
if locale:
for l in locale:
self.locales |= set(l.split(','))
self.locales |= set(locale.split(' '))
if locales_from:
with open(os.path.join(self.input_dir, locales_from), 'r') as fh:
root = ET.parse(fh).getroot()
@ -645,7 +644,7 @@ class PkgListGen(ToolBase.ToolBase):
else:
summary = self.solve_project(ignore_unresolvable=str2bool(target_config.get('pkglistgen-ignore-unresolvable')),
ignore_recommended=str2bool(target_config.get('pkglistgen-ignore-recommended')),
locale = target_config.get('pkglistgen-local'),
locale = target_config.get('pkglistgen-locale'),
locales_from = target_config.get('pkglistgen-locales-from'))
if stop_after_solve: