lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #5369 from NixOS/fix-invalid-rethrows

Browse source 
(partially) Revert "Don't copy in rethrow"
This commit is contained in:
Eelco Dolstra 2021-10-11 12:53:59 +02:00 committed by GitHub
parent 01e9f046a8 7466048d39
commit 22b67a1b63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/primops.cc
View file

@ -575,7 +575,7 @@ static Bindings::iterator getAttr(
// Adding another trace for the function name to make it clear // Adding another trace for the function name to make it clear
// which call received wrong arguments. // which call received wrong arguments.
e.addTrace(pos, hintfmt("while invoking '%s'", funcName)); e.addTrace(pos, hintfmt("while invoking '%s'", funcName));
throw; throw e;
} }
} }

2
src/libstore/build/local-derivation-goal.cc
View file

@ -948,7 +948,7 @@ void LocalDerivationGoal::startBuilder()
FdSource source(builderOut.readSide.get()); FdSource source(builderOut.readSide.get());
auto ex = readError(source); auto ex = readError(source);
ex.addTrace({}, "while setting up the build environment"); ex.addTrace({}, "while setting up the build environment");
throw; throw ex;
} }
debug("sandbox setup: " + msg); debug("sandbox setup: " + msg);
msgs.push_back(std::move(msg)); msgs.push_back(std::move(msg));