diff options
author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-10-23 17:56:12 +0100 |
---|---|---|
committer | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-10-29 11:09:54 +0000 |
commit | 6d16d70c418ef70bb60456408123008c293e037f (patch) | |
tree | 098590cd7e0916ba1df239cdadf40f8ba1c0fb24 | |
parent | 56a25c1e7ca30aa1d60ea8d3ca75def218a67057 (diff) | |
download | buildstream-6d16d70c418ef70bb60456408123008c293e037f.tar.gz |
Fix 'remove_item'->delete_entry
-rw-r--r-- | buildstream/storage/_casbaseddirectory.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py index f7ef35b18..a3bed3ed4 100644 --- a/buildstream/storage/_casbaseddirectory.py +++ b/buildstream/storage/_casbaseddirectory.py @@ -166,13 +166,13 @@ class CasBasedDirectory(Directory): existing_item = self._find_pb2_entry(name) if isinstance(existing_item, remote_execution_pb2.FileNode): # Directory imported over file with same name - self.remove_item(name) + self.delete_entry(name) elif isinstance(existing_item, remote_execution_pb2.SymlinkNode): # Directory imported over symlink with same source name if self.symlink_target_is_directory(existing_item): return self._resolve_symlink_or_directory(name) # That's fine; any files in the source directory should end up at the target of the symlink. else: - self.remove_item(name) # Symlinks to files get replaced + self.delete_entry(name) # Symlinks to files get replaced return self.descend(name, create=True) # Creates the directory if it doesn't already exist. |