diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2017-06-13 13:52:54 +0100 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2017-06-13 13:52:54 +0100 |
| commit | b8579e6e1e5eefe2739d91fce44f11a3b80e13b0 (patch) | |
| tree | ce3f6ef536ac2c402bdaa4080a09044217f65e13 /buildstream/scriptelement.py | |
| parent | 1ef4b6878a7694b774b37096ca098338cf81dc30 (diff) | |
| download | buildstream-b8579e6e1e5eefe2739d91fce44f11a3b80e13b0.tar.gz | |
scriptelement: Use element's name directly, rather than its path in the layout
Diffstat (limited to 'buildstream/scriptelement.py')
| -rw-r--r-- | buildstream/scriptelement.py | 6 |
1 files changed, 3 insertions, 3 deletions
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) |