From dfc0fb1cb888f7ba71bf84717e182d267a78261d Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 28 Jul 2023 17:32:28 +0300 Subject: Fix task request handler which could potentially issue unexpected rebuild task --- mod/mod-build-task.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx index 390fe8e..20a3518 100644 --- a/mod/mod-build-task.cxx +++ b/mod/mod-build-task.cxx @@ -1543,7 +1543,13 @@ handle (request& rq, response& rs) t.commit (); } - catch (const odb::deadlock&) {} // Just try with the next rebuild. + catch (const odb::deadlock&) + { + // Just try with the next rebuild. But first, reset the task + // response manifest that we may have prepared. + // + tsm = task_response_manifest (); + } // If the task response manifest is prepared, then bail out from the // package configuration rebuilds loop and respond. -- cgit v1.1