diff options
author | regnat <rg@regnat.ovh> | 2020-12-17 11:35:24 +0100 |
---|---|---|
committer | regnat <rg@regnat.ovh> | 2020-12-17 11:35:24 +0100 |
commit | 4d458394991f3086c3c9c306d000e6c0058c4fa7 (patch) | |
tree | b8770e3a76b43b0e38e5b42bb94435257e34e1a8 /src/libstore/local-store.hh | |
parent | ae3c3e3bb29cce34c98320f1fce4da63436f2bc8 (diff) |
Fix the detection of already built drv outputs
PRs #4370 and #4348 had a bad interaction in that the second broke the fist
one in a not trivial way.
The issue was that since #4348 the logic for detecting whether a
derivation output is already built requires some logic that was specific
to the `LocalStore`.
It happens though that most of this logic could be upstreamed to any `Store`,
which is what this commit does.
Diffstat (limited to 'src/libstore/local-store.hh')
-rw-r--r-- | src/libstore/local-store.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh index 69559e346..877dba742 100644 --- a/src/libstore/local-store.hh +++ b/src/libstore/local-store.hh @@ -127,7 +127,7 @@ public: StorePathSet queryValidDerivers(const StorePath & path) override; - std::map<std::string, std::optional<StorePath>> queryPartialDerivationOutputMap(const StorePath & path) override; + std::map<std::string, std::optional<StorePath>> queryDerivationOutputMapNoResolve(const StorePath & path) override; std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override; |