Apply suggestions from code review

Ericson2314 · roberth · web-flow · commit 8af286e7fa85 · 2023-07-14T09:32:03.000-04:00
Co-authored-by: Robert Hensing &lt;roberth@users.noreply.github.com&gt;
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
@@ -596,7 +596,7 @@ void LocalDerivationGoal::startBuilder()
         }
         if (hasPrefix(worker.store.storeDir, tmpDirInSandbox))
         {
-            throw Error("Inside the sandbox, `sandbox-build-dir` must not contain `store?store`");
+            throw Error("`sandbox-build-dir` must not contain the storeDir");
         }
         dirsInChroot[tmpDirInSandbox] = tmpDir;
 
diff --git a/tests/nested-sandboxing.sh b/tests/nested-sandboxing.sh
@@ -1,4 +1,5 @@
 source common.sh
+# This test is run by `tests/nested-sandboxing/runner.nix` in an extra layer of sandboxing.
 [[ -d /nix/store ]] || skipTest "running this test without Nix's deps being drawn from /nix/store is not yet supported"
 
 requireSandboxSupport

Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,7 @@ void LocalDerivationGoal::startBuilder()`
`596`	`596`	`}`
`597`	`597`	`if (hasPrefix(worker.store.storeDir, tmpDirInSandbox))`
`598`	`598`	`{`
`599`		- throw Error("Inside the sandbox, `sandbox-build-dir` must not contain `store?store`");
	`599`	+ throw Error("`sandbox-build-dir` must not contain the storeDir");
`600`	`600`	`}`
`601`	`601`	`dirsInChroot[tmpDirInSandbox] = tmpDir;`
`602`	`602`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`source common.sh`
	`2`	+# This test is run by `tests/nested-sandboxing/runner.nix` in an extra layer of sandboxing.
`2`	`3`	`[[ -d /nix/store ]] \|\| skipTest "running this test without Nix's deps being drawn from /nix/store is not yet supported"`
`3`	`4`
`4`	`5`	`requireSandboxSupport`