From 8cbdc36a60234b2e5476738db4a4e3c5cae85f71 Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Sun, 29 Jun 2025 20:44:39 +0200 Subject: [PATCH] Revert "libstore: fix scratch output cleanup" This reverts commit 1d36dd75965c30cae8c59db0b31173f16152dd68 as this is an insufficient fix for the critical correctness bug. Change-Id: Id48fec6e2146ccc98edb39629d9944404a17ba8c --- lix/libstore/build/local-derivation-goal.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc index 220ed5d26..e246d196c 100644 --- a/lix/libstore/build/local-derivation-goal.cc +++ b/lix/libstore/build/local-derivation-goal.cc @@ -539,9 +539,7 @@ kj::Promise> LocalDerivationGoal::startBuilder() /* Schedule this scratch output path for automatic deletion * if we do not cancel it, e.g. when registering the outputs. */ - scratchOutputsCleaner.emplace( - outputName, worker.store.toRealPath(worker.store.printStorePath(scratchPath)) - ); + scratchOutputsCleaner.insert_or_assign(outputName, worker.store.printStorePath(scratchPath)); /* Substitute output placeholders with the scratch output paths. We'll use during the build. */