wiptraveltissues/985-workspacesviacas

1 files changed, 3 insertions, 0 deletions

diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index 12f203f4e..7d5761cb8 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -1420,9 +1420,12 @@ class Element(Plugin):
                     import_dir = CasBasedDirectory(context.get_cascache())
 
                     try:
+                        if self._get_workspace():
+                            import_dir.import_files(temp_staging_directory)
                         for source in self.__sources[last_required_previous_ix:]:
                             source_dir = sourcecache.export(source)
                             import_dir.import_files(source_dir)
+
                     except SourceCacheError as e:
                         raise ElementError("Error trying to export source for {}: {}"
                                            .format(self.name, e))