diff options
| author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-10-30 10:00:26 +0000 |
|---|---|---|
| committer | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-10-30 10:00:26 +0000 |
| commit | 1a0669a21940ef93cf3d2c9b702cbbdec73b733c (patch) | |
| tree | 4438613d67ffbec8fc4490c77771e8f67634d9b3 | |
| parent | f206850543880e221f230fad43fad38df93a090d (diff) | |
| download | buildstream-1a0669a21940ef93cf3d2c9b702cbbdec73b733c.tar.gz | |
casbaseddirectory: Replace one instance of _force_resolve with descend
| -rw-r--r-- | buildstream/storage/_casbaseddirectory.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py index d9fa2da7d..092cc52d3 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) |