_loader.py: Cache how many Elements we load

2 files changed, 7 insertions, 5 deletions

diff --git a/src/buildstream/_loader/loader.py b/src/buildstream/_loader/loader.py
index 89458d40c..b2dc7c1c3 100644
--- a/src/buildstream/_loader/loader.py
+++ b/src/buildstream/_loader/loader.py
@@ -62,6 +62,7 @@ class Loader():
         # Public members
         #
         self.project = project   # The associated Project
+        self.loaded = None       # The number of loaded Elements
 
         #
         # Private members
@@ -146,6 +147,11 @@ class Loader():
 
         self._clean_caches()
 
+        # Cache how many Elements have just been loaded
+        if task:
+            # Workaround for task potentially being None (because no State object)
+            self.loaded = task.current_progress
+
         return ret
 
     # get_state_for_child_job_pickling(self)
diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py
index 00beebfab..9cff40868 100644
--- a/src/buildstream/_project.py
+++ b/src/buildstream/_project.py
@@ -434,13 +434,9 @@ class Project():
         with self._context.messenger.simple_task("Loading elements", silent_nested=True) as task:
             meta_elements = self.loader.load(targets, rewritable=rewritable, ticker=None, task=task)
 
-            # workaround for task potentially being None (because no State object)
-            if task:
-                total_elements = task.current_progress
-
         with self._context.messenger.simple_task("Resolving elements") as task:
             if task:
-                task.set_maximum_progress(total_elements)
+                task.set_maximum_progress(self.loader.loaded)
             elements = [
                 Element._new_from_meta(meta, task)
                 for meta in meta_elements