This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch jmac/cas_to_cas_oct in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit e1b047ef61cd3727355915868f6cd546b6a4205f Author: Jim MacArthur <[email protected]> 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 f293472..cc28fbd 100644 --- a/buildstream/storage/_casbaseddirectory.py +++ b/buildstream/storage/_casbaseddirectory.py @@ -165,13 +165,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.
