[buildstream] 14/43: Fix 'remove_item'->delete_entry

[gi...@apache.org]

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 6d16d70c418ef70bb60456408123008c293e037f
Author: Jim MacArthur <ji...@codethink.co.uk>
AuthorDate: Tue Oct 23 17:56:12 2018 +0100

    Fix 'remove_item'->delete_entry
---
 buildstream/storage/_casbaseddirectory.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py
index f7ef35b..a3bed3e 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.