diff options
| author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-08-03 13:59:43 +0100 |
|---|---|---|
| committer | Martin Blanchard <martin.blanchard@codethink.co.uk> | 2018-09-07 13:57:29 +0100 |
| commit | c73896bb594b9ddb050d6935b205448004828386 (patch) | |
| tree | ababd9993495357f4d419c3f917fa70ccaa134bf /buildstream | |
| parent | da53c00566c53a45bdb732cfc1168eb985832d8a (diff) | |
| download | buildstream-c73896bb594b9ddb050d6935b205448004828386.tar.gz | |
element.py: Get the updated virtual directory after running
Executing run() on a sandbox can now replace the virtual directory,
since remote execution returns a potentially different directory rather
than an update to the existing one. Call get_virtual_directory() again
after running to accout for this.
https://gitlab.com/BuildStream/buildstream/issues/454
Diffstat (limited to 'buildstream')
| -rw-r--r-- | buildstream/element.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/buildstream/element.py b/buildstream/element.py index 9bdfaaabf..d41ebac76 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -1576,6 +1576,8 @@ class Element(Plugin): finally: if collect is not None: try: + # Sandbox will probably have replaced its virtual directory, so get it again + sandbox_vroot = sandbox.get_virtual_directory() collectvdir = sandbox_vroot.descend(collect.lstrip(os.sep).split(os.sep)) except VirtualDirectoryError: # No collect directory existed |