[Notes] [Git][BuildStream/buildstream][mac_fixes] Sandbox: Ensure that we only import the sandbox subclasses when instantiate a sandbox

[James Ennis <gitlab mg gitlab com>]

Title: GitLab

James Ennis pushed to branch mac_fixes at BuildStream / buildstream

Commits:

• 9f88d607
  by James Ennis at 2018-09-21T11:02:10Z

  Sandbox: Ensure that we only import the sandbox subclasses when instantiate a sandbox
  
    - This patch was required due to not being able to execute `bst` on
    a Linux machine without Fuse or Bubblewrap available
  

4 changed files:

• buildstream/_platform/darwin.py
• buildstream/_platform/linux.py
• buildstream/_platform/unix.py
• buildstream/sandbox/__init__.py

Changes:

buildstream/_platform/darwin.py

---

...	...	@@ -19,7 +19,7 @@ import os
19	19	import resource
20	20
21	21	from .._exceptions import PlatformError
22		-from ..sandbox import SandboxChroot, SandboxDummy
	22	+from ..sandbox import DummySandbox
23	23
24	24	from . import Platform
25	25

buildstream/_platform/linux.py

---

...	...	@@ -24,7 +24,7 @@ from .. import _site
24	24	from .. import utils
25	25	from .._artifactcache.cascache import CASCache
26	26	from .._message import Message, MessageType
27		-from ..sandbox import SandboxBwrap, SandboxDummy
	27	+from ..sandbox import DummySandbox
28	28
29	29	from . import Platform
30	30
...	...	@@ -52,6 +52,7 @@ class Linux(Platform):
52	52	if not self._local_sandbox_available():
53	53	return SandboxDummy(*args, **kwargs)
54	54	else:
	55	+ from ..sandbox._sandboxbwrap import SandboxBwrap
55	56	# Inform the bubblewrap sandbox as to whether it can use user namespaces or not
56	57	kwargs['user_ns_available'] = self._user_ns_available
57	58	kwargs['die_with_parent_available'] = self._die_with_parent_available

buildstream/_platform/unix.py

---

...	...	@@ -21,7 +21,6 @@ import os
21	21
22	22	from .._artifactcache.cascache import CASCache
23	23	from .._exceptions import PlatformError
24		-from ..sandbox import SandboxChroot
25	24
26	25	from . import Platform
27	26
...	...	@@ -41,4 +40,5 @@ class Unix(Platform):
41	40	return self._artifact_cache
42	41
43	42	def create_sandbox(self, *args, **kwargs):
	43	+ from ..sandbox._sandboxchroot import SandboxChroot
44	44	return SandboxChroot(*args, **kwargs)

buildstream/sandbox/__init__.py

---

...	...	@@ -18,7 +18,5 @@
18	18	# Tristan Maat <tristan maat codethink co uk>
19	19
20	20	from .sandbox import Sandbox, SandboxFlags
21		-from ._sandboxchroot import SandboxChroot
22		-from ._sandboxbwrap import SandboxBwrap
23	21	from ._sandboxremote import SandboxRemote
24	22	from ._sandboxdummy import SandboxDummy

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.