_casbaseddirectory.py: _add_directory(): Drop unused code path

The code path in _add_directory() where the entry already exists was
unused. Drop it and add assertion.

1 files changed, 3 insertions, 10 deletions

diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py
index adcefc006..cf059e568 100644
--- a/buildstream/storage/_casbaseddirectory.py
+++ b/buildstream/storage/_casbaseddirectory.py
@@ -175,17 +175,10 @@ class CasBasedDirectory(Directory):
         return None
 
     def _add_directory(self, name):
-        if name in self.index:
-            newdir = self.index[name].buildstream_object
-            if not isinstance(newdir, CasBasedDirectory):
-                # TODO: This may not be an actual error; it may actually overwrite it
-                raise VirtualDirectoryError("New directory {} in {} would overwrite existing non-directory of type {}"
-                                            .format(name, str(self), type(newdir)))
-            dirnode = self._find_pb2_entry(name)
-        else:
-            newdir = CasBasedDirectory(self.cas_cache, parent=self, filename=name)
-            dirnode = self.pb2_directory.directories.add()
+        assert name not in self.index
 
+        newdir = CasBasedDirectory(self.cas_cache, parent=self, filename=name)
+        dirnode = self.pb2_directory.directories.add()
         dirnode.name = name
 
         # Calculate the hash for an empty directory