summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan van Berkom <tristan@codethink.co.uk>2020-09-26 18:10:29 +0900
committerTristan van Berkom <tristan@codethink.co.uk>2020-09-26 18:10:29 +0900
commit89a8c9df997bd4dbc5bd6b1f7d5e9dc697fcf780 (patch)
treee1233b9e34cc712a4b49714bb7f64c2f60d537fa
parent344ab38a7143d84489d62f75e75e4bc88f79e756 (diff)
downloadbuildstream-tristan/fix-logging-regression.tar.gz
BuildElement: Fix logging regressiontristan/fix-logging-regression
Staging activities are usually silent nested, this regressed when porting to recently changed APIs.
-rw-r--r--src/buildstream/buildelement.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/buildstream/buildelement.py b/src/buildstream/buildelement.py
index 6020e67db..5554e7fb2 100644
--- a/src/buildstream/buildelement.py
+++ b/src/buildstream/buildelement.py
@@ -279,8 +279,9 @@ class BuildElement(Element):
#
sorted_locations = sorted(self.__layout)
for location in sorted_locations:
- element_list = [element for element, _ in self.__layout[location]]
- self.stage_dependency_artifacts(sandbox, element_list, path=location)
+ with self.timed_activity("Staging dependencies at: {}".format(location), silent_nested=True):
+ element_list = [element for element, _ in self.__layout[location]]
+ self.stage_dependency_artifacts(sandbox, element_list, path=location)
# Now integrate any elements staged in the root
#