Merge pull request #8399 from tweag/fix-chrooted-stores-error-path

edolstra · web-flow · commit 61ddfa154bcf · 2023-05-27T17:55:57.000+02:00
Properly report build errors on chrooted stores
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
@@ -357,7 +357,7 @@ bool LocalDerivationGoal::cleanupDecideWhetherDiskFull()
         for (auto & [_, status] : initialOutputs) {
             if (!status.known) continue;
             if (buildMode != bmCheck && status.known->isValid()) continue;
-            auto p = worker.store.printStorePath(status.known->path);
+            auto p = worker.store.toRealPath(status.known->path);
             if (pathExists(chrootRootDir + p))
                 renameFile((chrootRootDir + p), p);
         }

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ bool LocalDerivationGoal::cleanupDecideWhetherDiskFull()`
`357`	`357`	`for (auto & [_, status] : initialOutputs) {`
`358`	`358`	`if (!status.known) continue;`
`359`	`359`	`if (buildMode != bmCheck && status.known->isValid()) continue;`
`360`		`- auto p = worker.store.printStorePath(status.known->path);`
	`360`	`+ auto p = worker.store.toRealPath(status.known->path);`
`361`	`361`	`if (pathExists(chrootRootDir + p))`
`362`	`362`	`renameFile((chrootRootDir + p), p);`
`363`	`363`	`}`