Call _populate_index only in the constructor

1 files changed, 5 insertions, 7 deletions

diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py
index f4b6673b7..aed1542bf 100644
--- a/buildstream/storage/_casbaseddirectory.py
+++ b/buildstream/storage/_casbaseddirectory.py
@@ -73,6 +73,7 @@ class CasBasedDirectory(Directory):
         self.index = OrderedDict()
         self.parent = parent
         self._directory_read = False
+        self._populate_index()
 
     # Functions taken from googlecas.py
 
@@ -119,16 +120,15 @@ class CasBasedDirectory(Directory):
         return digest
 
     # End of functions from googlecas.py
-                            
+
     def _populate_index(self) -> None:
         if self._directory_read:
+            raise VirtualDirectoryError("_populate_index called twice")
             return
         # Replace with tree read
         
         for entry in self.directory.directories:
-            print("Creating new CasBasedDirectory '{}' during index population".format(entry.name))
-            if entry.name not in self.index:
-                self.index[entry.name] = CasBasedDirectory(self.context, ref=entry.digest,parent=self,name=entry.name)
+            self.index[entry.name] = CasBasedDirectory(self.context, ref=entry.digest,parent=self,name=entry.name)
         for entry in self.directory.files:
             self.index[entry.name] = _FileObject(self, entry)
 
@@ -156,6 +156,7 @@ class CasBasedDirectory(Directory):
         filenode = self.directory.files.add()
         filenode.name = filename
         self._hash_object(digest=filenode.digest, path=os.path.join(basename, filename))
+        self.index[filename] = _FileObject(basename, filename)
         self.recalculate_hash()
         print("  Added file {} which now has hash {}".format(filename, filenode.digest.hash[0:7]))
         
@@ -183,7 +184,6 @@ class CasBasedDirectory(Directory):
             return self.descend(subdirectory_spec[1:], create)
 
         print("Descending from {} into '{}'".format(self, subdirectory_spec))
-        self._populate_index()
         if subdirectory_spec[0] in self.index:
             entry = self.index[subdirectory_spec[0]]
             if isinstance(entry, CasBasedDirectory):
@@ -217,7 +217,6 @@ class CasBasedDirectory(Directory):
             if os.path.isfile(pathname):
                 print("Attempting to import FILE {} from {}".format(name, source_directory))
                 self._add_new_file(source_directory, name)
-        self._populate_index()
 
     def save(self, name):
         """Saves this directory into the content cache."""
@@ -320,7 +319,6 @@ class CasBasedDirectory(Directory):
     def is_empty(self) -> bool:
         """ Return true if this directory has no files, subdirectories or links in it.
         """
-        self._populate_index()
         return len(self.index) == 0
 
     def mark_unmodified(self) -> None: