summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2017-07-12 08:41:04 +0200
committerJürg Billeter <j@bitron.ch>2017-07-14 14:13:51 +0200
commitebfdb5905659f512ae773b4bf52cff29280fc746 (patch)
tree264de92d1dbaf1c29172713c680d03c23a356335
parent15beacbabeb8235649717f4d5d71575b8fec6710 (diff)
downloadbuildstream-ebfdb5905659f512ae773b4bf52cff29280fc746.tar.gz
widget.py: Use _get_full_display_key()
-rw-r--r--buildstream/_frontend/widget.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/buildstream/_frontend/widget.py b/buildstream/_frontend/widget.py
index a371799ea..2c0cc180c 100644
--- a/buildstream/_frontend/widget.py
+++ b/buildstream/_frontend/widget.py
@@ -226,9 +226,7 @@ class CacheKey(Widget):
if element_id is not None:
plugin = _plugin_lookup(element_id)
if isinstance(plugin, Element):
- if not plugin._get_cache_key():
- missing = True
- key = plugin._get_display_key()
+ _, key, missing = plugin._get_full_display_key()
if message.message_type in [MessageType.FAIL, MessageType.BUG]:
text = self.err_profile.fmt(key)
@@ -527,14 +525,8 @@ class LogLine(Widget):
for element in dependencies:
line = format
- cache_key = element._get_display_key()
- full_key = element._get_cache_key()
-
- # Show unresolved cache keys as dim
- dim_keys = False
- if not full_key:
- dim_keys = True
- full_key = "{:?<64}".format('')
+
+ full_key, cache_key, dim_keys = element._get_full_display_key()
line = p.fmt_subst(line, 'name', element.name, fg='blue', bold=True)
line = p.fmt_subst(line, 'key', cache_key, fg='yellow', dim=dim_keys)