diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-01-29 16:12:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 16:12:50 +0100 |
| commit | b19aec7eeb8353be6c59b2967a511a5072612d99 (patch) | |
| tree | ff46059c72ebfcaa9a7fa2624a5d268d2056b245 | |
| parent | ab31513969249350352ea380ed6df2f2d4ffcc85 (diff) | |
| parent | 9da11bac5797c34b7bb2ee99275befe9c9fb6dd9 (diff) | |
Merge pull request #4461 from NixOS/ca/error-logging-fixes
Fix some logging with ca derivations
| -rw-r--r-- | src/libstore/build/derivation-goal.cc | 4 | ||||
| -rw-r--r-- | src/libstore/store-api.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index 179a010d4..8717499c0 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -536,12 +536,12 @@ void DerivationGoal::inputsRealised() if (!optRealizedInput) throw Error( "derivation '%s' requires output '%s' from input derivation '%s', which is supposedly realized already, yet we still don't know what path corresponds to that output", - worker.store.printStorePath(drvPath), j, worker.store.printStorePath(drvPath)); + worker.store.printStorePath(drvPath), j, worker.store.printStorePath(depDrvPath)); worker.store.computeFSClosure(*optRealizedInput, inputPaths); } else throw Error( "derivation '%s' requires non-existent output '%s' from input derivation '%s'", - worker.store.printStorePath(drvPath), j, worker.store.printStorePath(drvPath)); + worker.store.printStorePath(drvPath), j, worker.store.printStorePath(depDrvPath)); } } } diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index d4ec1497f..37c11fe86 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -394,7 +394,7 @@ OutputPathMap Store::queryDerivationOutputMap(const StorePath & path) { OutputPathMap result; for (auto & [outName, optOutPath] : resp) { if (!optOutPath) - throw Error("output '%s' has no store path mapped to it", outName); + throw Error("output '%s' of derivation '%s' has no store path mapped to it", outName, printStorePath(path)); result.insert_or_assign(outName, *optOutPath); } return result; |