diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2020-09-27 02:33:24 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2020-09-27 02:33:24 +0000 |
| commit | 9861583b70621377c2ab250afc7e0e220a47f555 (patch) | |
| tree | e1233b9e34cc712a4b49714bb7f64c2f60d537fa | |
| parent | bb317336072f3bad2693718d03e8737113d863c5 (diff) | |
| parent | 89a8c9df997bd4dbc5bd6b1f7d5e9dc697fcf780 (diff) | |
| download | buildstream-9861583b70621377c2ab250afc7e0e220a47f555.tar.gz | |
Merge branch 'tristan/fix-logging-regression' into 'master'
Fix logging regression
See merge request BuildStream/buildstream!2076
| -rw-r--r-- | src/buildstream/buildelement.py | 5 | ||||
| -rw-r--r-- | src/buildstream/scriptelement.py | 5 |
2 files changed, 6 insertions, 4 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 # 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 # |