From c683ff8dc595008f2a8a20c9f262bb9dee4b576e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Wed, 23 Aug 2023 17:49:18 +0200 Subject: [PATCH] worker: remove ValueError work-around for kobo from ErrataDiffBuild task Related: https://github.com/release-engineering/kobo/pull/220 Resolves: https://gitlab.cee.redhat.com/covscan/covscan/-/issues/134 --- osh/worker/tasks/task_errata_diff_build.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/osh/worker/tasks/task_errata_diff_build.py b/osh/worker/tasks/task_errata_diff_build.py index 8ffa30acc..c84112ddf 100644 --- a/osh/worker/tasks/task_errata_diff_build.py +++ b/osh/worker/tasks/task_errata_diff_build.py @@ -51,18 +51,8 @@ def run(self): self.hub.worker.set_scan_to_basescanning(scan_id) self.hub.worker.assign_task(subtask_id) self.hub.worker.create_sb(subtask_id) - try: - self.wait() - except ValueError: - # there is a race condition here: - # File "/usr/lib/python2.6/site-packages/osh/worker/tasks/task_errata_diff_build.py", line 60, in run - # self.wait() - # File "/usr/lib/python2.6/site-packages/kobo/worker/task.py", line 153, in wait - # self._subtask_list.remove(i) - # ValueError: list.remove(x): x not in list - # - # FIXME: workaround it here for now - pass + + self.wait() self.hub.worker.set_scan_to_scanning(scan_id) scanning_args = self.hub.worker.get_scanning_args(scanning_session_id)