From fcc151d7898e466569c5f9e628217e476c1eaba8 Mon Sep 17 00:00:00 2001
From: eldritch horrors <pennae@lix.systems>
Date: Sun, 19 Jan 2025 16:40:26 +0100
Subject: [PATCH] libstore: drop retries from LocalStore::cacheDrvOutputMapping

retries must happen outside of the state lock lifetime, otherwise
retries may keep transactions alive that should have been killed.

Change-Id: I9088975283aac9fc4521aa2f0bd000335740f6c7
---
 lix/libstore/local-store.cc | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lix/libstore/local-store.cc b/lix/libstore/local-store.cc
index 82e2e8a9a..bc83dffab 100644
--- a/lix/libstore/local-store.cc
+++ b/lix/libstore/local-store.cc
@@ -818,13 +818,11 @@ void LocalStore::cacheDrvOutputMapping(
     const std::string & outputName,
     const StorePath & output)
 {
-    retrySQLite([&]() {
-        state.stmts->AddDerivationOutput.use()
-            (deriver)
-            (outputName)
-            (printStorePath(output))
-            .exec();
-    });
+    state.stmts->AddDerivationOutput.use()
+        (deriver)
+        (outputName)
+        (printStorePath(output))
+        .exec();
 }