Commit e1fce098 authored by Jim MacArthur's avatar Jim MacArthur
Browse files

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.
parent a57ccc95

buildstream/element.py

+2 −0
Original line number Diff line number Diff line
@@ -1565,6 +1565,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