summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan van Berkom <tristan@codethink.co.uk>2020-09-26 18:09:12 +0900
committerTristan van Berkom <tristan@codethink.co.uk>2020-09-26 18:09:12 +0900
commit344ab38a7143d84489d62f75e75e4bc88f79e756 (patch)
tree258f4399f5ac013b5335400a9a27bb2248565957
parentbb317336072f3bad2693718d03e8737113d863c5 (diff)
downloadbuildstream-344ab38a7143d84489d62f75e75e4bc88f79e756.tar.gz
ScriptElement: Fix logging regression
Staging activities are usually silent nested, this regressed when porting to recently changed APIs.
-rw-r--r--src/buildstream/scriptelement.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/buildstream/scriptelement.py b/src/buildstream/scriptelement.py
index 0a3a4d3dc..3b642056e 100644
--- a/src/buildstream/scriptelement.py
+++ b/src/buildstream/scriptelement.py
@@ -232,8 +232,9 @@ class ScriptElement(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
#