lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

nix verify --all: Support local binary caches

Browse source
This commit is contained in:
Eelco Dolstra 2016-04-29 17:34:31 +02:00
parent 0dd988d2e3
commit 6963de2091
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libstore/local-binary-cache-store.cc
View file

@ -33,6 +33,20 @@ protected:
std::shared_ptr<std::string> getFile(const std::string & path) override; std::shared_ptr<std::string> getFile(const std::string & path) override;
PathSet queryAllValidPaths() override
{
PathSet paths;
for (auto & entry : readDirectory(binaryCacheDir)) {
if (entry.name.size() != 40 ||
!hasSuffix(entry.name, ".narinfo"))
continue;
paths.insert(settings.nixStore + "/" + entry.name.substr(0, entry.name.size() - 8));
}
return paths;
}
}; };
void LocalBinaryCacheStore::init() void LocalBinaryCacheStore::init()

4
src/libstore/s3-binary-cache-store.cc
View file

@ -227,8 +227,8 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
for (auto object : contents) { for (auto object : contents) {
auto & key = object.GetKey(); auto & key = object.GetKey();
if (!hasSuffix(key, ".narinfo")) continue; if (key.size() != 40 || !hasSuffix(key, ".narinfo")) continue;
paths.insert(settings.nixStore + "/" + std::string(key, 0, key.size() - 8)); paths.insert(settings.nixStore + "/" + key.substr(0, key.size() - 8));
} }
marker = res.GetNextMarker(); marker = res.GetNextMarker();