Will Salmon pushed to branch willsalmon/shellBuildTrees at BuildStream / buildstream
Commits:
-
60ee5fa2
by William Salmon at 2018-12-18T11:05:47Z
2 changed files:
Changes:
| ... | ... | @@ -2232,6 +2232,7 @@ class Element(Plugin): |
| 2232 | 2232 |
specs=self.__remote_execution_specs,
|
| 2233 | 2233 |
bare_directory=bare_directory,
|
| 2234 | 2234 |
allow_real_directory=False)
|
| 2235 |
+ yield sandbox
|
|
| 2235 | 2236 |
|
| 2236 | 2237 |
elif directory is not None and os.path.exists(directory):
|
| 2237 | 2238 |
if allow_remote and self.__remote_execution_specs:
|
| ... | ... | @@ -2249,6 +2250,7 @@ class Element(Plugin): |
| 2249 | 2250 |
config=config,
|
| 2250 | 2251 |
bare_directory=bare_directory,
|
| 2251 | 2252 |
allow_real_directory=not self.BST_VIRTUAL_DIRECTORY)
|
| 2253 |
+ yield sandbox
|
|
| 2252 | 2254 |
|
| 2253 | 2255 |
else:
|
| 2254 | 2256 |
os.makedirs(context.builddir, exist_ok=True)
|
| ... | ... | @@ -2262,10 +2264,6 @@ class Element(Plugin): |
| 2262 | 2264 |
# Cleanup the build dir
|
| 2263 | 2265 |
utils._force_rmtree(rootdir)
|
| 2264 | 2266 |
|
| 2265 |
- return
|
|
| 2266 |
- sandbox.usebuildtree = None
|
|
| 2267 |
- yield sandbox
|
|
| 2268 |
- |
|
| 2269 | 2267 |
def __compose_default_splits(self, defaults):
|
| 2270 | 2268 |
project = self._get_project()
|
| 2271 | 2269 |
|
| ... | ... | @@ -116,6 +116,7 @@ class Sandbox(): |
| 116 | 116 |
self.__env = None
|
| 117 | 117 |
self.__mount_sources = {}
|
| 118 | 118 |
self.__allow_real_directory = kwargs['allow_real_directory']
|
| 119 |
+ self.usebuildtree = False
|
|
| 119 | 120 |
|
| 120 | 121 |
# Plugin ID for logging
|
| 121 | 122 |
plugin = kwargs.get('plugin', None)
|