From 6211e5e284ff4b5ad52d6ea3e1f8f7163b9c743c Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Mon, 4 Mar 2024 05:26:02 +0100 Subject: [PATCH] Merge pull request #9271 from keszybz/if-fix fix: gcc complains about if which doesn't guard the indented statement (cherry picked from commit 8d663462938a333a4e81cce1005437f141cd11fa) Change-Id: Ifa2e65502de4000935549dde82ab1b5867e2f0ed --- src/libstore/build/local-derivation-goal.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc index cbf8392d7..4b090e820 100644 --- a/src/libstore/build/local-derivation-goal.cc +++ b/src/libstore/build/local-derivation-goal.cc @@ -1553,10 +1553,11 @@ void LocalDerivationGoal::addDependency(const StorePath & path) Path source = worker.store.Store::toRealPath(path); Path target = chrootRootDir + worker.store.printStorePath(path); - if (pathExists(target)) + if (pathExists(target)) { // There is a similar debug message in doBind, so only run it in this block to not have double messages. debug("bind-mounting %s -> %s", target, source); throw Error("store path '%s' already exists in the sandbox", worker.store.printStorePath(path)); + } /* Bind-mount the path into the sandbox. This requires entering its mount namespace, which is not possible