From b8579e6e1e5eefe2739d91fce44f11a3b80e13b0 Mon Sep 17 00:00:00 2001 From: Jonathan Maw Date: Tue, 13 Jun 2017 13:52:54 +0100 Subject: scriptelement: Use element's name directly, rather than its path in the layout --- buildstream/scriptelement.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'buildstream/scriptelement.py') diff --git a/buildstream/scriptelement.py b/buildstream/scriptelement.py index e0bc91ce3..3814928ae 100644 --- a/buildstream/scriptelement.py +++ b/buildstream/scriptelement.py @@ -206,12 +206,12 @@ class ScriptElement(Element): if element: break if item['destination'] == '/': - with self.timed_activity("Staging {} at /".format(item['element'].name), + with self.timed_activity("Staging {} at /".format(element.name), silent_nested=True): element.stage_dependency_artifacts(sandbox, Scope.RUN) else: with self.timed_activity("Staging {} at {}" - .format(item['element'].name, item['destination']), + .format(element.name, item['destination']), silent_nested=True): real_dstdir = os.path.join(sandbox.get_directory(), item['destination'].lstrip(os.sep)) @@ -225,7 +225,7 @@ class ScriptElement(Element): break # Integration commands can only be run for elements staged to / if item['destination'] == '/': - with self.timed_activity("Integrating {}".format(item['element']), + with self.timed_activity("Integrating {}".format(element.name), silent_nested=True): for dep in element.dependencies(Scope.RUN): dep.integrate(sandbox) -- cgit v1.2.1