SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: Allow a default repo to be specified for patches

Browse Source 
Signed-off-by: Paul Barker <pbarker@konsulko.com>
[Jan: style fix]
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Paul Barker
2020-07-04 09:53:39 +02:00
committed by Jan Kiszka
parent 2260189fda
commit b107a60118
4 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kas/configschema.py
View File

@@ -83,6 +83,15 @@ CONFIGSCHEMA = {
'refspec': {
'type': 'string',
},
'patches': {
'type': 'object',
'additionalProperties': False,
'properties': {
'repo': {
'type': 'string',
},
},
},
},
},
},
@@ -164,7 +173,7 @@ CONFIGSCHEMA = {
{
'type': 'object',
'additionalProperties': False,
'required': ['repo', 'path'],
'required': ['path'],
'properties': {
'repo': {
'type': 'string'

19
kas/repos.py
View File

@@ -25,6 +25,7 @@
import re
import os
import sys
import logging
from urllib.parse import urlparse
from .context import get_context
@@ -87,15 +88,23 @@ class Repo:
str(laydict[x]).lower() not in
['disabled', 'excluded', 'n', 'no', '0', 'false'],
layers_dict))
default_patch_repo = repo_defaults.get('patches', {}).get('repo', None)
patches_dict = repo_config.get('patches', {})
patches = list(
{
patches = []
for p in sorted(patches_dict):
if not patches_dict[p]:
continue
this_patch = {
'id': p,
'repo': patches_dict[p]['repo'],
'repo': patches_dict[p].get('repo', default_patch_repo),
'path': patches_dict[p]['path'],
}
for p in sorted(patches_dict)
if patches_dict[p])
if this_patch['repo'] is None:
logging.error('No repo specified for patch entry "%s" and no '
'default repo specified.', p)
sys.exit(1)
patches.append(this_patch)
url = repo_config.get('url', None)
name = repo_config.get('name', name)
typ = repo_config.get('type', 'git')