From c5bc0edb977bc6481d2a79af0ac18772c609069f Mon Sep 17 00:00:00 2001 From: Tom Pollard Date: Wed, 31 Jul 2019 17:53:34 +0100 Subject: quick test --- src/buildstream/_scheduler/jobs/job.py | 19 +++++-------------- src/buildstream/plugin.py | 2 +- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/buildstream/_scheduler/jobs/job.py b/src/buildstream/_scheduler/jobs/job.py index bffc9e235..5cb7a0eae 100644 --- a/src/buildstream/_scheduler/jobs/job.py +++ b/src/buildstream/_scheduler/jobs/job.py @@ -607,16 +607,7 @@ class ChildJob(): # def message(self, message_type, message, **kwargs): kwargs['scheduler'] = True - element_name = self._message_element_name - element_key = self._message_element_key - if "element_name" in kwargs: - element_name = kwargs["element_name"] - del kwargs["element_name"] - if "element_key" in kwargs: - element_key = kwargs["element_key"] - del kwargs["element_key"] - self._messenger.message(Message(message_type, message, element_name=element_name, - element_key=element_key, **kwargs)) + self._messenger.message(Message(message_type, message, **kwargs)) # send_message() # @@ -859,10 +850,10 @@ class ChildJob(): def _child_message_handler(self, message, is_silenced): message.action_name = self.action_name - if message.element_name is None and self._message_element_name: - message.element_name = self._message_element_name - if message.element_key is None and self._message_element_key: - message.element_key = self._message_element_key + #if message.element_name is None and self._message_element_name: + message.element_name = self._message_element_name + #if message.element_key is None and self._message_element_key: + message.element_key = self._message_element_key # Send to frontend if appropriate if is_silenced and (message.message_type not in unconditional_messages): diff --git a/src/buildstream/plugin.py b/src/buildstream/plugin.py index 3987dac26..48454babd 100644 --- a/src/buildstream/plugin.py +++ b/src/buildstream/plugin.py @@ -742,7 +742,7 @@ class Plugin(): # def _get_full_name(self): project = self.__project - name = self._element_name if self.__type_tag == "source" else self.name # pylint: disable=no-member + name = self.name # pylint: disable=no-member if project.junction: return '{}:{}'.format(project.junction.name, name) else: -- cgit v1.2.1