diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:53:16 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:53:16 +0200 |
| commit | 091eb323ba2787ce64a1fb2796e7e06dbee6037c (patch) | |
| tree | 446a869245541bd48f303caef76e4c24f6e7d0bb /nix | |
| parent | 05fef7bfc60058763f5a64ec0feaf3876b56281d (diff) | |
| parent | 0c5299200ffcd16370f047b7ccb187c60f30da34 (diff) | |
| download | guix-091eb323ba2787ce64a1fb2796e7e06dbee6037c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/libstore/build.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index 9305208009..10a6093bd5 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -979,7 +979,7 @@ void DerivationGoal::outputsSubstituted() return; } if (buildMode == bmCheck && nrInvalid > 0) - throw Error(format("some outputs of `%1%' are not valid, so checking is not possible") % drvPath); + throw Error(format("`%1%' is missing outputs; build it normally before using `--check'") % drvPath); /* Otherwise, at least one of the output paths could not be produced using a substitute. So we have to build instead. */ @@ -2422,7 +2422,7 @@ void DerivationGoal::registerOutputs() if (pathExists(dst)) deletePath(dst); if (rename(actualPath.c_str(), dst.c_str())) throw SysError(format("renaming `%1%' to `%2%'") % actualPath % dst); - throw Error(format("derivation `%1%' may not be deterministic: output `%2%' differs from ‘%3%’") + throw Error(format("derivation `%1%' may not be deterministic: output `%2%' differs from `%3%'") % drvPath % path % dst); } else throw Error(format("derivation `%1%' may not be deterministic: output `%2%' differs") |