summaryrefslogtreecommitdiff
path: root/buildstream/scriptelement.py
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-06-07 18:04:18 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-06-07 18:04:18 +0900
commitd17d99446436334190e3328c4ffdc05ab12892b0 (patch)
tree2d370d16676135b6539c58ad4819e5972cc7d516 /buildstream/scriptelement.py
parent11a6b4e095a4d92be83bac622454228311f2556d (diff)
downloadbuildstream-d17d99446436334190e3328c4ffdc05ab12892b0.tar.gz
scriptelement.py: Cosmetic fix; use element names in messages.
Instead of directly formatted elements, this looks more comprehensive.
Diffstat (limited to 'buildstream/scriptelement.py')
-rw-r--r--buildstream/scriptelement.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/buildstream/scriptelement.py b/buildstream/scriptelement.py
index a4144f7af..0771f015f 100644
--- a/buildstream/scriptelement.py
+++ b/buildstream/scriptelement.py
@@ -182,11 +182,11 @@ class ScriptElement(Element):
# if no layout set, stage all dependencies into /
for build_dep in self.dependencies(Scope.BUILD, recurse=False):
with self.timed_activity("Staging {} at /"
- .format(build_dep), silent_nested=True):
+ .format(build_dep.name), silent_nested=True):
build_dep.stage_dependencies(sandbox, Scope.RUN, path="/")
for build_dep in self.dependencies(Scope.BUILD, recurse=False):
- with self.timed_activity("Integrating {}".format(build_dep), silent_nested=True):
+ with self.timed_activity("Integrating {}".format(build_dep.name), silent_nested=True):
for dep in build_dep.dependencies(Scope.RUN):
dep.integrate(sandbox)
else:
@@ -197,12 +197,12 @@ class ScriptElement(Element):
if element:
break
if item['destination'] == '/':
- with self.timed_activity("Staging {} at /".format(item['element']),
+ with self.timed_activity("Staging {} at /".format(item['element'].name),
silent_nested=True):
element.stage_dependencies(sandbox, Scope.RUN)
else:
with self.timed_activity("Staging {} at {}"
- .format(item['element'], item['destination']),
+ .format(item['element'].name, item['destination']),
silent_nested=True):
real_dstdir = os.path.join(sandbox.get_directory(),
item['destination'].lstrip(os.sep))