From a6f490a551928c1d39453585a220ddadbd8ffe24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Thu, 10 Sep 2020 17:18:27 +0200 Subject: _state.py: Use separate task identifier `State.add_task()` required the job name to be unique in the session. However, the tuple `(action_name, full_name)` is not guaranteed to be unique. E.g., multiple `ArtifactElement` objects with the same element name may participate in a single session. Use a separate task identifier to fix this. --- src/buildstream/_messenger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/buildstream/_messenger.py') diff --git a/src/buildstream/_messenger.py b/src/buildstream/_messenger.py index 805f56b5b..b9ceb2107 100644 --- a/src/buildstream/_messenger.py +++ b/src/buildstream/_messenger.py @@ -209,7 +209,7 @@ class Messenger: message = Message(MessageType.START, activity_name, element_name=element_name) self.message(message) - task = self._state.add_task(activity_name, full_name) + task = self._state.add_task(full_name, activity_name, full_name) task.set_render_cb(self._render_status) self._active_simple_tasks += 1 if not self._next_render: @@ -224,7 +224,7 @@ class Messenger: self.message(message) raise finally: - self._state.remove_task(activity_name, full_name) + self._state.remove_task(full_name) self._active_simple_tasks -= 1 if self._active_simple_tasks == 0: self._next_render = None -- cgit v1.2.1