summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim MacArthur <jim.macarthur@codethink.co.uk>2018-10-23 17:56:12 +0100
committerJim MacArthur <jim.macarthur@codethink.co.uk>2018-10-23 17:56:12 +0100
commite1b047ef61cd3727355915868f6cd546b6a4205f (patch)
tree218a0a66ae943c634b09cef105cfdf12eac57ba6
parent957539a0efb4cc0e2b9917bec3f13c5b2ef823c5 (diff)
downloadbuildstream-e1b047ef61cd3727355915868f6cd546b6a4205f.tar.gz
Fix 'remove_item'->delete_entry
-rw-r--r--buildstream/storage/_casbaseddirectory.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py
index f29347281..cc28fbd98 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.