wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 10:11:47 +02:00
Code Activity

Input::getAccessor(): Get the fingerprint from the final accessor

Browse source 
Fixes an issue reported by @erikarvstedt where
InputAccessor::fetchToStore() wouldn't cache the store path the first
time.
This commit is contained in:
Eelco Dolstra 2022-10-10 17:50:21 +02:00
parent 1483c56582
commit 7317196807
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libfetchers/cache.cc
View file

@ -130,6 +130,7 @@ struct CacheImpl : Cache
std::string_view key, std::string_view key,
std::string_view value) override std::string_view value) override
{ {
debug("upserting fact '%s' -> '%s'", key, value);
_state.lock()->upsertFact.use() _state.lock()->upsertFact.use()
(key) (key)
(value).exec(); (value).exec();

2
src/libfetchers/fetchers.cc
View file

@ -162,7 +162,7 @@ std::pair<ref<InputAccessor>, Input> Input::getAccessor(ref<Store> store) const
try { try {
auto [accessor, final] = scheme->getAccessor(store, *this); auto [accessor, final] = scheme->getAccessor(store, *this);
accessor->fingerprint = scheme->getFingerprint(store, *this); accessor->fingerprint = scheme->getFingerprint(store, final);
checkLocks(final); checkLocks(final);
return {accessor, std::move(final)}; return {accessor, std::move(final)};
} catch (Error & e) { } catch (Error & e) {