diff options
| author | Phillip Smyth <phillipsmyth@Nexus-x240.dyn.ducie.codethink.co.uk> | 2018-06-18 14:34:39 +0100 |
|---|---|---|
| committer | knownexus <phillip.smyth@codethink.co.uk> | 2018-08-10 11:17:47 +0100 |
| commit | db0478abc83afb96dc1c146668ad1e8eb7fa671f (patch) | |
| tree | 7ecdf379cca9a6bb94cfa280424658aa16612c11 /buildstream/element.py | |
| parent | a602365c263489ae6eda71d47f63587f5e1ad4d1 (diff) | |
| download | buildstream-db0478abc83afb96dc1c146668ad1e8eb7fa671f.tar.gz | |
Implementing relative workspacesrelative_workspaces
This fixes #191
A note has been added to NEWS explaining backwards
compatibility issues
Diffstat (limited to 'buildstream/element.py')
| -rw-r--r-- | buildstream/element.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/buildstream/element.py b/buildstream/element.py index a011869cd..a099e934b 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -1403,7 +1403,8 @@ class Element(Plugin): # If mount_workspaces is set and we're doing incremental builds, # the workspace is already mounted into the sandbox. if not (mount_workspaces and self.__can_build_incrementally()): - with self.timed_activity("Staging local files at {}".format(workspace.path)): + with self.timed_activity("Staging local files at {}" + .format(workspace.get_absolute_path())): workspace.stage(temp_staging_directory) else: # No workspace, stage directly @@ -1566,7 +1567,7 @@ class Element(Plugin): path_components = self.__staged_sources_directory.lstrip(os.sep).split(os.sep) sandbox_vpath = sandbox_vroot.descend(path_components) try: - sandbox_vpath.import_files(workspace.path) + sandbox_vpath.import_files(workspace.get_absolute_path()) except UtilError as e: self.warn("Failed to preserve workspace state for failed build sysroot: {}" .format(e)) @@ -1893,7 +1894,7 @@ class Element(Plugin): source._init_workspace(temp) # Now hardlink the files into the workspace target. - utils.link_files(temp, workspace.path) + utils.link_files(temp, workspace.get_absolute_path()) # _get_workspace(): # |