wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 23:11:16 +02:00
Code Activity

HttpBinaryCacheStore: Fix caching of WantMassQuery

Browse source 
Also, test HttpBinaryCacheStore in addition to LocalBinaryCacheStore.
This commit is contained in:
Eelco Dolstra 2016-06-01 15:15:21 +02:00
parent 7850d3d279
commit cf198952d0
6 changed files with 60 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,9 +17,6 @@ public:
: BinaryCacheStore(params)
, binaryCacheDir(binaryCacheDir)
{
/* For testing the NAR info cache. */
if (getEnv("_NIX_CACHE_FILE_URLS") == "1")
diskCache = getNarInfoDiskCache();
}
void init() override;
@ -57,9 +54,6 @@ void LocalBinaryCacheStore::init()
{
createDirs(binaryCacheDir + "/nar");
BinaryCacheStore::init();
if (diskCache && !diskCache->cacheExists(getUri()))
diskCache->createCache(getUri(), storeDir, wantMassQuery_, priority);
}
static void atomicWrite(const Path & path, const std::string & s)
@ -96,7 +90,9 @@ static RegisterStoreImplementation regStore([](
const std::string & uri, const Store::Params & params)
-> std::shared_ptr<Store>
{
if (std::string(uri, 0, 7) != "file://") return 0;
if (getEnv("_NIX_FORCE_HTTP_BINARY_CACHE_STORE") == "1" ||
std::string(uri, 0, 7) != "file://")
return 0;
auto store = std::make_shared<LocalBinaryCacheStore>(params, std::string(uri, 7));
store->init();
return store;