diff options
| author | Valentin David <valentin.david@codethink.co.uk> | 2020-04-02 17:54:29 +0200 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2020-04-15 05:51:54 +0000 |
| commit | 86f013dbffa87692250ce1aefd31cecd1559ddd5 (patch) | |
| tree | 0aff67bc43d39ad0b8b599202b25acef78b039e2 /src/buildstream/_project.py | |
| parent | 4bdb97396ed8e286c8b433a371eea63e1c10bdc0 (diff) | |
| download | buildstream-86f013dbffa87692250ce1aefd31cecd1559ddd5.tar.gz | |
Process options in includes files with the options of their junctionvalentindavid/include-options-from-junction
Unfortunately the options from main project cannot always be processed
in the include processing since project configuration might load
option declarations from a separate file. For that reason the result
of `Include.process` should still be passed through the option
processor. But all options files included from junctioned are already
evaluated.
Diffstat (limited to 'src/buildstream/_project.py')
| -rw-r--r-- | src/buildstream/_project.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py index 7b31f44b8..9e5d92b7c 100644 --- a/src/buildstream/_project.py +++ b/src/buildstream/_project.py @@ -654,7 +654,7 @@ class Project: self._project_includes = Includes(self.loader, copy_tree=False) project_conf_first_pass = self._project_conf.clone() - self._project_includes.process(project_conf_first_pass, only_local=True) + self._project_includes.process(project_conf_first_pass, only_local=True, process_project_options=False) config_no_include = self._default_config_node.clone() project_conf_first_pass._composite(config_no_include) @@ -679,7 +679,7 @@ class Project: # def _load_second_pass(self): project_conf_second_pass = self._project_conf.clone() - self._project_includes.process(project_conf_second_pass) + self._project_includes.process(project_conf_second_pass, process_project_options=False) config = self._default_config_node.clone() project_conf_second_pass._composite(config) |