summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim MacArthur <jim.macarthur@codethink.co.uk>2018-07-17 18:35:36 +0100
committerJim MacArthur <jim.macarthur@codethink.co.uk>2018-07-17 18:35:36 +0100
commitfab331624359caa642bf254214a5caf8e27f26e4 (patch)
tree20b18ab5938cce361396fc339cc73a4219516056
parent9f1ba0e72559e27381ff30bd6377985334397c6f (diff)
downloadbuildstream-fab331624359caa642bf254214a5caf8e27f26e4.tar.gz
Replace full_import with partial_import but with a generated filelist
-rw-r--r--buildstream/storage/_casbaseddirectory.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py
index 13faa89ba..368c42c9d 100644
--- a/buildstream/storage/_casbaseddirectory.py
+++ b/buildstream/storage/_casbaseddirectory.py
@@ -548,9 +548,8 @@ class CasBasedDirectory(Directory):
replace one directory with another's hash, without doing any recursion.
"""
if files is None:
- return self._full_import_cas_into_cas(source_directory)
- else:
- return self._partial_import_cas_into_cas(source_directory, files)
+ files = source_directory.list_relative_paths()
+ return self._partial_import_cas_into_cas(source_directory, files)
def import_files(self, external_pathspec: any, files: List[str] = None,
report_written: bool = True, update_utimes: bool = False,