summaryrefslogtreecommitdiff
path: root/src/buildstream/_frontend
diff options
context:
space:
mode:
authorTom Pollard <tom.pollard@codethink.co.uk>2019-12-10 15:32:12 +0000
committerTom Pollard <tom.pollard@codethink.co.uk>2020-01-09 11:23:01 +0000
commit5c1a6ae58fc569b1d4dc50248298f3c0d993076d (patch)
tree3bf20dd40b80d3dcdf406a08277ea6fafb849098 /src/buildstream/_frontend
parent5960a90e03b1e5115f6e5912b126529846e589f5 (diff)
downloadbuildstream-5c1a6ae58fc569b1d4dc50248298f3c0d993076d.tar.gz
_frontend/widget.py: show_pipeline() Don't show buildable for junction
Instead output "junction" in magenta for info. Also include test in format/junctions.py
Diffstat (limited to 'src/buildstream/_frontend')
-rw-r--r--src/buildstream/_frontend/cli.py2
-rw-r--r--src/buildstream/_frontend/widget.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/buildstream/_frontend/cli.py b/src/buildstream/_frontend/cli.py
index 365f5c421..fc501f09c 100644
--- a/src/buildstream/_frontend/cli.py
+++ b/src/buildstream/_frontend/cli.py
@@ -565,7 +565,7 @@ def show(app, elements, deps, except_, order, format_):
%{name} The element name
%{key} The abbreviated cache key (if all sources are consistent)
%{full-key} The full cache key (if all sources are consistent)
- %{state} cached, buildable, waiting or inconsistent
+ %{state} cached, buildable, waiting, inconsistent or junction
%{config} The element configuration
%{vars} Variable configuration
%{env} Environment settings
diff --git a/src/buildstream/_frontend/widget.py b/src/buildstream/_frontend/widget.py
index 63fbfbb7d..98ebf31f3 100644
--- a/src/buildstream/_frontend/widget.py
+++ b/src/buildstream/_frontend/widget.py
@@ -350,7 +350,9 @@ class LogLine(Widget):
if consistency == Consistency.INCONSISTENT:
line = p.fmt_subst(line, "state", "no reference", fg="red")
else:
- if element._cached_failure():
+ if element.get_kind() == "junction":
+ line = p.fmt_subst(line, "state", "junction", fg="magenta")
+ elif element._cached_failure():
line = p.fmt_subst(line, "state", "failed", fg="red")
elif element._cached_success():
line = p.fmt_subst(line, "state", "cached", fg="magenta")