Fix interpretation of repo release config

Release config should not be overwritten during the merge.y

Change-Id: Iedec7e63eac9698a46491a2b08def98b814cc47d
This commit is contained in:
Ilya Shakhat 2016-08-16 17:47:28 +03:00
parent 28a0469ed2
commit 9235353d40
1 changed files with 3 additions and 1 deletions

View File

@ -161,7 +161,9 @@ def _update_project_list(default_data):
repos_dict = dict((r['uri'], r) for r in repos)
for r in default_data['repos']:
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
default_data['repos'] += [r for r in repos_dict.values()