diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-16 17:28:52 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-16 17:28:52 +0000 |
| commit | cc0d77f8c9c71f5870bcaf3d0c041b6ba4c1bf63 (patch) | |
| tree | 1776c2a44d9e32a6842f310c38f362bf59bb1ffb /src/libstore/local-fs-store.cc | |
| parent | c466cb2091b7a382aba1739c0320f2b6c0a04c1e (diff) | |
| parent | 5ea817dace2b554e602d7f9df6e43084ad112e3d (diff) | |
Merge branch 'hash-always-has-type' of github.com:obsidiansystems/nix into better-ca-parse-errors
Diffstat (limited to 'src/libstore/local-fs-store.cc')
| -rw-r--r-- | src/libstore/local-fs-store.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/local-fs-store.cc b/src/libstore/local-fs-store.cc index dd96d2578..2f1d9663a 100644 --- a/src/libstore/local-fs-store.cc +++ b/src/libstore/local-fs-store.cc @@ -20,9 +20,9 @@ struct LocalStoreAccessor : public FSAccessor Path toRealPath(const Path & path) { - Path storePath = store->toStorePath(path); - if (!store->isValidPath(store->parseStorePath(storePath))) - throw InvalidPath("path '%1%' is not a valid store path", storePath); + auto storePath = store->toStorePath(path).first; + if (!store->isValidPath(storePath)) + throw InvalidPath("path '%1%' is not a valid store path", store->printStorePath(storePath)); return store->getRealStoreDir() + std::string(path, store->storeDir.size()); } |