diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2020-12-16 14:52:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-16 14:52:39 +0100 |
commit | fdc8e7cbe7728cc1d855ab5f56fc8451f2eb9ce3 (patch) | |
tree | 665863c3556f44ccc2f99aca48d62f45c7a4857c | |
parent | 3765174691590e690296284f717a6f3a326e3345 (diff) | |
parent | cac8d5b742ec0cb80ad7232e20f63c74a217e545 (diff) |
Merge pull request #4373 from NixOS/ca/fix-queryPartialDrvOutputMap-when-no-derivation
Don't ignore an absent drv file in queryPartialDrvOutputMap
-rw-r--r-- | src/libstore/local-store.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 1539c94e2..20bbc73cf 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -912,12 +912,7 @@ LocalStore::queryPartialDerivationOutputMap(const StorePath& path_) auto state(_state.lock()); std::map<std::string, std::optional<StorePath>> outputs; uint64_t drvId; - try { - drvId = queryValidPathId(*state, path); - } catch (InvalidPath&) { - // Ignore non-existing drvs as they might still have an output map - // defined if ca-derivations is enabled - } + drvId = queryValidPathId(*state, path); auto use(state->stmts->QueryDerivationOutputs.use()(drvId)); while (use.next()) outputs.insert_or_assign( |