Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-04-08 01:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix architecture check if Release file is used

Browse Source 
When the architecture are read from the Release file, they are not
defined in the config file.

Adding 'all' as an architecture will not give the correct result. To
avoid confusion, explicitly check for this and error out if it is added.
This commit is contained in:
Ivo De Decker 2020-02-14 20:54:34 +00:00
parent 9056323165
commit 64ba19cde4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
britney2/inputs/suiteloader.py
View File

@ -19,8 +19,6 @@ class SuiteContentLoader(object):
def __init__(self, base_config):
self._base_config = base_config
self._architectures = SuiteContentLoader.config_str_as_list(base_config.architectures)
assert 'all' not in self._architectures, "all not allowed in architectures"
self._nobreakall_arches = SuiteContentLoader.config_str_as_list(base_config.nobreakall_arches, [])
self._outofsync_arches = SuiteContentLoader.config_str_as_list(base_config.outofsync_arches, [])
self._break_arches = SuiteContentLoader.config_str_as_list(base_config.break_arches, [])
@ -135,6 +133,7 @@ class DebMirrorLikeSuiteContentLoader(SuiteContentLoader):
# Intern architectures for efficiency; items in this list will be used for lookups and
# building items/keys - by intern strings we reduce memory (considerably).
self._architectures = [sys.intern(arch) for arch in allarches]
assert 'all' not in self._architectures, "all not allowed in architectures"
def _get_suite_name(self, suite, release_file):
for name in ('Suite', 'Codename'):