diff options
author | Jürg Billeter <j@bitron.ch> | 2020-05-12 15:34:26 +0200 |
---|---|---|
committer | William Salmon <will.salmon@codethink.co.uk> | 2020-05-28 08:36:11 +0000 |
commit | 1a94912ef15e2ad827332b93d97cb9d1c797ddb4 (patch) | |
tree | dfa020e8523cd4d23d9d8f127bbbef84b42a4851 /src/buildstream/element.py | |
parent | 53beb9219a117264897133b28506f73aae1c7015 (diff) | |
download | buildstream-1a94912ef15e2ad827332b93d97cb9d1c797ddb4.tar.gz |
element.py: Expand variables in sandbox config
Diffstat (limited to 'src/buildstream/element.py')
-rw-r--r-- | src/buildstream/element.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py index 580871802..18e42c722 100644 --- a/src/buildstream/element.py +++ b/src/buildstream/element.py @@ -314,7 +314,9 @@ class Element(Plugin): self.__remote_execution_specs = project.remote_execution_specs # Extract Sandbox config - self.__sandbox_config = self.__extract_sandbox_config(context, project, meta) + sandbox_config = self.__extract_sandbox_config(project, meta) + self.__variables.expand(sandbox_config) + self.__sandbox_config = SandboxConfig(sandbox_config, context.platform) def __lt__(self, other): return self.name < other.name @@ -2701,7 +2703,7 @@ class Element(Plugin): # Sandbox-specific configuration data, to be passed to the sandbox's constructor. # @classmethod - def __extract_sandbox_config(cls, context, project, meta): + def __extract_sandbox_config(cls, project, meta): if meta.is_junction: sandbox_config = Node.from_dict({}) else: @@ -2715,7 +2717,7 @@ class Element(Plugin): meta.sandbox._composite(sandbox_config) sandbox_config._assert_fully_composited() - return SandboxConfig(sandbox_config, context.platform) + return sandbox_config # This makes a special exception for the split rules, which # elements may extend but whos defaults are defined in the project. |