don't use casdirtraveltissues/tmp1

2 files changed, 6 insertions, 8 deletions

diff --git a/src/buildstream/plugins/sources/workspace.py b/src/buildstream/plugins/sources/workspace.py
index 5d808e275..c940f7ab1 100644
--- a/src/buildstream/plugins/sources/workspace.py
+++ b/src/buildstream/plugins/sources/workspace.py
@@ -55,8 +55,6 @@ class WorkspaceSource(Source):
         self.__unique_key = None
         # the digest of the Directory following the import of the workspace
         self.__digest = None
-        # the CasBasedDirectory which the path is imported into
-        self.__cas_dir = None
 
     def track(self) -> SourceRef:
         return None
@@ -80,7 +78,7 @@ class WorkspaceSource(Source):
 
     def get_unique_key(self) -> (str, SourceRef):
         if self.__digest is None:
-            self.__cas_dir, self.__digest = self.stage_into_cas(self.path)
+            self.__digest = self.stage_into_cas(self.path)
         return (self.path, self.__digest)
 
     # init_workspace()
@@ -97,7 +95,7 @@ class WorkspaceSource(Source):
         pass  # pragma: nocover
 
     def stage(self, directory: Directory) -> None:
-        self.stage_into_directory(self.__cas_dir, directory)
+        self.stage_into_directory(self.path, directory)
 
     def _get_local_path(self) -> str:
         return self.path
diff --git a/src/buildstream/source.py b/src/buildstream/source.py
index 534f984be..5f6d0e234 100644
--- a/src/buildstream/source.py
+++ b/src/buildstream/source.py
@@ -163,7 +163,7 @@ Class Reference
 
 import os
 from contextlib import contextmanager
-from typing import Iterable, Iterator, Optional, Tuple, TYPE_CHECKING, Union
+from typing import Iterable, Iterator, Optional, Tuple, TYPE_CHECKING
 
 from . import _yaml, utils
 from .node import MappingNode
@@ -670,13 +670,13 @@ class Source(Plugin):
         project = self._get_project()
         return project.directory
 
-    def stage_into_cas(self, path: str) -> Tuple[Directory, str]:
+    def stage_into_cas(self, path: str) -> str:
         with self.timed_activity("Staging local files into CAS"):
             cas_dir = self._get_cas_dir()
             self.stage_into_directory(path, cas_dir)
-            return cas_dir, self._get_dir_hash(cas_dir)
+            return self._get_dir_hash(cas_dir)
 
-    def stage_into_directory(self, path: Union[str, Directory], directory: Directory) -> None:
+    def stage_into_directory(self, path: str, directory: Directory) -> None:
         assert isinstance(directory, Directory)
         assert path
         if isinstance(path, str):