From d227ad324e7d3dc79cf1e5b76b882ccf21e9ed4a Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Sun, 29 Jun 2025 20:35:21 +0200 Subject: [PATCH] Revert "libstore: fix scratch output cleanup" This reverts commit 779e795732d8d1e6ada77039b6e4cf0d10051ba6 as this is an insufficient fix for the critical correctness bug. Change-Id: I5681c9f25537e01892e4c9e7feff2cee8b6edb25 --- src/libstore/build/local-derivation-goal.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc index 8837ac25d..cfcda1311 100644 --- a/src/libstore/build/local-derivation-goal.cc +++ b/src/libstore/build/local-derivation-goal.cc @@ -530,9 +530,7 @@ void 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. */