зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1603844 - [manifestparser] Merge 'prefs' from defaults instead of overwriting them, r=gbrown
While the 'prefs' key can only exist in the DEFAULT section of manifests, this allows parent manifests to propagate their prefs down to included ones. Differential Revision: https://phabricator.services.mozilla.com/D57635 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
a0c9590371
Коммит
8ced09349b
|
@ -155,6 +155,7 @@ def combine_fields(global_vars, local_vars):
|
|||
if not local_vars:
|
||||
return global_vars.copy()
|
||||
field_patterns = {
|
||||
'prefs': '%s %s',
|
||||
'skip-if': '(%s) || (%s)',
|
||||
'support-files': '%s %s',
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче