From e2224844019d58fc947ce00e18e9fa9974d2c8b5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 May 2016 13:33:05 +0200 Subject: Re-implement the WantMassQuery property of binary caches --- src/libstore/http-binary-cache-store.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/libstore/http-binary-cache-store.cc') diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc index 073f76cc9e65..8c8d545c6d85 100644 --- a/src/libstore/http-binary-cache-store.cc +++ b/src/libstore/http-binary-cache-store.cc @@ -5,6 +5,8 @@ namespace nix { +MakeError(UploadToHTTP, Error); + class HttpBinaryCacheStore : public BinaryCacheStore { private: @@ -38,9 +40,12 @@ public: { // FIXME: do this lazily? if (!diskCache->cacheExists(cacheUri)) { - if (!fileExists("nix-cache-info")) + try { + BinaryCacheStore::init(); + } catch (UploadToHTTP &) { throw Error(format("‘%s’ does not appear to be a binary cache") % cacheUri); - diskCache->createCache(cacheUri); + } + diskCache->createCache(cacheUri, wantMassQuery_, priority); } } @@ -66,7 +71,7 @@ protected: void upsertFile(const std::string & path, const std::string & data) override { - throw Error("uploading to an HTTP binary cache is not supported"); + throw UploadToHTTP("uploading to an HTTP binary cache is not supported"); } std::shared_ptr getFile(const std::string & path) override -- cgit 1.4.1