This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch jmac/cas_to_cas_oct_v2 in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 1a0669a21940ef93cf3d2c9b702cbbdec73b733c Author: Jim MacArthur <[email protected]> AuthorDate: Tue Oct 30 10:00:26 2018 +0000 casbaseddirectory: Replace one instance of _force_resolve with descend --- buildstream/storage/_casbaseddirectory.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py index d9fa2da..092cc52 100644 --- a/buildstream/storage/_casbaseddirectory.py +++ b/buildstream/storage/_casbaseddirectory.py @@ -542,8 +542,7 @@ class CasBasedDirectory(Directory): else: dest_subdir = x else: - self.create_directory(dirname) # Unnecssary? Why force_resolve if we resolve? - dest_subdir = self._force_resolve(dirname) + dest_subdir = self.descend(dirname, create=True) src_subdir = source_directory.descend(dirname) import_result = dest_subdir._partial_import_cas_into_cas(src_subdir, subcomponents, path_prefix=fullname, file_list_required=file_list_required)
