diff options
| author | Jürg Billeter <j@bitron.ch> | 2020-03-31 09:09:17 +0200 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-04-14 15:30:49 +0000 |
| commit | d75b0fc080d57e78aea9ed7908cc7b3af5ad6e01 (patch) | |
| tree | 42c41fd8a3cd754011e2b3c0c82dba8d3b978e5e /src/buildstream/_platform | |
| parent | afb35bb157ae02df5022f220c2e10dcd4e51d4ad (diff) | |
| download | buildstream-d75b0fc080d57e78aea9ed7908cc7b3af5ad6e01.tar.gz | |
Drop concept of partially supported sandbox configuration
Allowing builds without affecting the cache key but disallowing push,
when the sandbox configuration is not fully compatible, results in an
inconsistent user experience and may lead to unexpected build issues.
Especially as push is allowed or disallowed based on the sandbox
available at the time of push, not at the time of build.
The previous commit making build-uid and build-gid configuration
optional allows each project to decide whether the sandbox is required
to support UID/GID configuration or not.
Diffstat (limited to 'src/buildstream/_platform')
| -rw-r--r-- | src/buildstream/_platform/darwin.py | 2 | ||||
| -rw-r--r-- | src/buildstream/_platform/fallback.py | 2 | ||||
| -rw-r--r-- | src/buildstream/_platform/linux.py | 2 | ||||
| -rw-r--r-- | src/buildstream/_platform/platform.py | 2 | ||||
| -rw-r--r-- | src/buildstream/_platform/win32.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/buildstream/_platform/darwin.py b/src/buildstream/_platform/darwin.py index 2e244557e..e880ea6f6 100644 --- a/src/buildstream/_platform/darwin.py +++ b/src/buildstream/_platform/darwin.py @@ -47,7 +47,7 @@ class Darwin(Platform): @staticmethod def _check_dummy_sandbox_config(config): - return True + pass @staticmethod def _create_dummy_sandbox(*args, **kwargs): diff --git a/src/buildstream/_platform/fallback.py b/src/buildstream/_platform/fallback.py index b9e9f520d..d80ac8fde 100644 --- a/src/buildstream/_platform/fallback.py +++ b/src/buildstream/_platform/fallback.py @@ -21,7 +21,7 @@ from .platform import Platform class Fallback(Platform): def _check_dummy_sandbox_config(self, config): - return True + pass def _create_dummy_sandbox(self, *args, **kwargs): kwargs["dummy_reason"] = ( diff --git a/src/buildstream/_platform/linux.py b/src/buildstream/_platform/linux.py index c5192c86d..670cfc6b9 100644 --- a/src/buildstream/_platform/linux.py +++ b/src/buildstream/_platform/linux.py @@ -86,7 +86,7 @@ class Linux(Platform): def _check_sandbox_config_bwrap(self, config): from ..sandbox._sandboxbwrap import SandboxBwrap - return SandboxBwrap.check_sandbox_config(self, config) + SandboxBwrap.check_sandbox_config(self, config) def _create_bwrap_sandbox(self, *args, **kwargs): from ..sandbox._sandboxbwrap import SandboxBwrap diff --git a/src/buildstream/_platform/platform.py b/src/buildstream/_platform/platform.py index e0a0cf7ce..f3a9964d1 100644 --- a/src/buildstream/_platform/platform.py +++ b/src/buildstream/_platform/platform.py @@ -268,7 +268,7 @@ class Platform: def _check_sandbox_config_buildboxrun(self, config): from ..sandbox._sandboxbuildboxrun import SandboxBuildBoxRun - return SandboxBuildBoxRun.check_sandbox_config(self, config) + SandboxBuildBoxRun.check_sandbox_config(self, config) @staticmethod def _create_buildboxrun_sandbox(*args, **kwargs): diff --git a/src/buildstream/_platform/win32.py b/src/buildstream/_platform/win32.py index a2529d8f6..33645e030 100644 --- a/src/buildstream/_platform/win32.py +++ b/src/buildstream/_platform/win32.py @@ -45,7 +45,7 @@ class Win32(Platform): @staticmethod def _check_dummy_sandbox_config(config): - return True + pass @staticmethod def _create_dummy_sandbox(*args, **kwargs): |