Merge branch 'tristan/fix-artifact-name-hack' into 'master'

_stream.py, _frontend/widget.py: Fix weird hack

See merge request BuildStream/buildstream!2117

2 files changed, 12 insertions, 7 deletions

diff --git a/src/buildstream/_frontend/widget.py b/src/buildstream/_frontend/widget.py
index 0f2b07ed3..0d5379f43 100644
--- a/src/buildstream/_frontend/widget.py
+++ b/src/buildstream/_frontend/widget.py
@@ -32,6 +32,7 @@ from .. import __version__ as bst_version
 from .._exceptions import BstError, ImplError
 from .._message import MessageType
 from ..storage.directory import _FileType
+from .._artifactelement import ArtifactElement
 
 # These messages are printed a bit differently
 ERROR_MESSAGES = [MessageType.FAIL, MessageType.ERROR, MessageType.BUG]
@@ -902,8 +903,18 @@ class LogLine(Widget):
         report = ""
         p = Profile()
         for element in targets:
+
+            #
+            # Here we selectively show the element name or artifact name
+            # depending on whether we were asked about an artifact or an element.
+            #
+            if isinstance(element, ArtifactElement):
+                element_name = element.get_artifact_name()
+            else:
+                element_name = element._get_full_name()
+
             line = "%{state: >12} %{name}"
-            line = p.fmt_subst(line, "name", element.name, fg="yellow")
+            line = p.fmt_subst(line, "name", element_name, fg="yellow")
 
             if element._cached_success():
                 line = p.fmt_subst(line, "state", "cached", fg="magenta")
diff --git a/src/buildstream/_stream.py b/src/buildstream/_stream.py
index b50be2a0d..0aff5fb94 100644
--- a/src/buildstream/_stream.py
+++ b/src/buildstream/_stream.py
@@ -617,12 +617,6 @@ class Stream:
         if self._artifacts.has_fetch_remotes():
             self._pipeline.check_remotes(target_objects)
 
-        # XXX: We need to set the name of an ArtifactElement to its ref in order
-        #      to display the expected result in the frontend
-        for obj in target_objects:
-            if isinstance(obj, ArtifactElement):
-                obj.name = obj.get_artifact_name()
-
         return target_objects
 
     # artifact_log()