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

Merge pull request #1429 from jberry-suse/conf-priority-int

Browse Source 
osclib/conf: change priority to be string to work with ConfigParser.
This commit is contained in:
Stephan Kulow 2018-03-08 11:19:00 +01:00 committed by GitHub
commit defd9954b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osclib/conf.py
View File

@ -133,7 +133,7 @@ DEFAULT = {
'remote-config': False,
'delreq-review': None,
'main-repo': 'standard',
'priority': 100, # Lower than SLE-15 since less specific.
'priority': '100', # Lower than SLE-15 since less specific.
},
# Allows devel projects to utilize tools that require config, but not
# complete StagingAPI support.
@ -152,7 +152,7 @@ DEFAULT = {
'delreq-review': None,
'main-repo': 'openSUSE_Factory',
'remote-config': False,
'priority': 1000, # Lowest priority as only a fallback.
'priority': '1000', # Lowest priority as only a fallback.
},
}
@ -189,7 +189,7 @@ class Config(object):
def populate_conf(self):
"""Add sane default into the configuration."""
defaults = {}
default_ordered = OrderedDict(sorted(DEFAULT.items(), key=lambda i: i[1].get('priority', 99)))
default_ordered = OrderedDict(sorted(DEFAULT.items(), key=lambda i: int(i[1].get('priority', 99))))
for prj_pattern in default_ordered:
match = re.match(prj_pattern, self.project)
if match: