picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2018-01-31 15:12:27 +01:00
parent 6270b2e50f
commit 30370f168f
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/download.hh
View file

@ -21,8 +21,8 @@ struct DownloadRequest
std::shared_ptr<std::string> data;
std::string mimeType;
DownloadRequest(const std::string & uri, std::shared_ptr<std::string> data = nullptr, std::string mimeType = "")
: uri(uri), parentAct(curActivity), data(std::move(data)), mimeType(std::move(mimeType)) { }
DownloadRequest(const std::string & uri)
: uri(uri), parentAct(curActivity) { }
};
struct DownloadResult

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

@ -38,7 +38,7 @@ public:
try {
BinaryCacheStore::init();
} catch (UploadToHTTP &) {
throw Error(format("'%s' does not appear to be a binary cache") % cacheUri);
throw Error("'%s' does not appear to be a binary cache", cacheUri);
}
diskCache->createCache(cacheUri, storeDir, wantMassQuery_, priority);
}
@ -67,8 +67,9 @@ protected:
const std::string & data,
const std::string & mimeType) override
{
auto data_ = std::make_shared<string>(data);
auto req = DownloadRequest(cacheUri + "/" + path, data_, mimeType);
auto req = DownloadRequest(cacheUri + "/" + path);
req.data = std::make_shared<string>(data); // FIXME: inefficient
req.mimeType = mimeType;
try {
getDownloader()->download(req);
} catch (DownloadError & e) {