Fix interpretation of repo release config
Release config should not be overwritten during the merge.y Change-Id: Iedec7e63eac9698a46491a2b08def98b814cc47d
This commit is contained in:
parent
28a0469ed2
commit
9235353d40
|
@ -161,7 +161,9 @@ def _update_project_list(default_data):
|
||||||
repos_dict = dict((r['uri'], r) for r in repos)
|
repos_dict = dict((r['uri'], r) for r in repos)
|
||||||
for r in default_data['repos']:
|
for r in default_data['repos']:
|
||||||
if r['uri'] in repos_dict:
|
if r['uri'] in repos_dict:
|
||||||
r.update(repos_dict[r['uri']])
|
for k, v in repos_dict[r['uri']].items():
|
||||||
|
if k not in r:
|
||||||
|
r[k] = v
|
||||||
|
|
||||||
# update default data
|
# update default data
|
||||||
default_data['repos'] += [r for r in repos_dict.values()
|
default_data['repos'] += [r for r in repos_dict.values()
|
||||||
|
|
Loading…
Reference in New Issue