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/_loader | |
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/_loader')
-rw-r--r-- | src/buildstream/_loader/loader.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/buildstream/_loader/loader.py b/src/buildstream/_loader/loader.py index 35de1b97d..ea795a7d7 100644 --- a/src/buildstream/_loader/loader.py +++ b/src/buildstream/_loader/loader.py @@ -282,8 +282,6 @@ class Loader: self._includes.process(node) - self._options.process_node(node) - element = LoadElement(node, filename, self) self._elements[filename] = element |