diff options
author | regnat <rg@regnat.ovh> | 2020-12-15 10:54:24 +0100 |
---|---|---|
committer | regnat <rg@regnat.ovh> | 2020-12-15 20:10:46 +0100 |
commit | 7080321618e29033a8b5dc2f9fc938dcf2df270d (patch) | |
tree | d950e9e64bfa798c23fce3a881f805e7470cae81 /src/libstore/nar-accessor.cc | |
parent | f2f60bf5d6c95453f89e47e01fe0bd6a7fdc85bb (diff) |
Use the fs accessor for readInvalidDerivation
Extend `FSAccessor::readFile` to allow not checking that the path is a
valid one, and rewrite `readInvalidDerivation` using this extended
`readFile`.
Several places in the code use `readInvalidDerivation`, either because
they need to read a derivation that has been written in the store but
not registered yet, or more generally to prevent a deadlock because
`readDerivation` tries to lock the state, so can't be called from a
place where the lock is already held.
However, `readInvalidDerivation` implicitely assumes that the store is a
`LocalFSStore`, which isn't always the case.
The concrete motivation for this is that it's required for `nix copy
--from someBinaryCache` to work, which is tremendously useful for the
tests.
Diffstat (limited to 'src/libstore/nar-accessor.cc')
-rw-r--r-- | src/libstore/nar-accessor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/nar-accessor.cc b/src/libstore/nar-accessor.cc index 1427a0f98..784ebb719 100644 --- a/src/libstore/nar-accessor.cc +++ b/src/libstore/nar-accessor.cc @@ -203,7 +203,7 @@ struct NarAccessor : public FSAccessor return res; } - std::string readFile(const Path & path) override + std::string readFile(const Path & path, bool requireValidPath = true) override { auto i = get(path); if (i.type != FSAccessor::Type::tRegular) |