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

Make the store directory a member variable of Store

Browse source
This commit is contained in:
Eelco Dolstra 2016-06-01 14:49:12 +02:00
parent 1b5b654fe2
commit 7850d3d279
35 changed files with 315 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/http-binary-cache-store.cc
View file

@ -18,7 +18,7 @@ private:
public:
HttpBinaryCacheStore(
const StoreParams & params, const Path & _cacheUri)
const Params & params, const Path & _cacheUri)
: BinaryCacheStore(params)
, cacheUri(_cacheUri)
, downloaders(
@ -45,7 +45,7 @@ public:
} catch (UploadToHTTP &) {
throw Error(format("‘%s’ does not appear to be a binary cache") % cacheUri);
}
diskCache->createCache(cacheUri, wantMassQuery_, priority);
diskCache->createCache(cacheUri, storeDir, wantMassQuery_, priority);
}
}
@ -91,7 +91,7 @@ protected:
};
static RegisterStoreImplementation regStore([](
const std::string & uri, const StoreParams & params)
const std::string & uri, const Store::Params & params)
-> std::shared_ptr<Store>
{
if (std::string(uri, 0, 7) != "http://" &&