diff options
| author | Jürg Billeter <j@bitron.ch> | 2018-10-01 18:47:20 +0200 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2018-10-01 18:47:20 +0200 |
| commit | 29fca28d147705915107957988c884656b1f03b3 (patch) | |
| tree | 84580b7515c61ccdf6e5f1008e8233984c0b5836 | |
| parent | cf00c0a1317dddbab08859dd02c41b38eb35b9b9 (diff) | |
| download | buildstream-juerg/dummy-sandbox.tar.gz | |
_platform/linux.py: Accept all configs for dummy sandboxjuerg/dummy-sandbox
If Sandbox.run() is never called, sandbox config is irrelevant. If it is
called, the build will fail anyway with the dummy sandbox.
This matches the logic in the Darwin platform.
| -rw-r--r-- | buildstream/_platform/linux.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/buildstream/_platform/linux.py b/buildstream/_platform/linux.py index 85bfbd852..0bf422a89 100644 --- a/buildstream/_platform/linux.py +++ b/buildstream/_platform/linux.py @@ -55,7 +55,10 @@ class Linux(Platform): return SandboxBwrap(*args, **kwargs) def check_sandbox_config(self, config): - if self._user_ns_available: + if not self._local_sandbox_available(): + # Accept all sandbox configs as it's irrelevant with the dummy sandbox (no Sandbox.run). + return True + elif self._user_ns_available: # User namespace support allows arbitrary build UID/GID settings. return True else: |