lix-project/lix
18
38
Fork 14
Code Issues 288 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Merge "libstore/filetransfer: use Lix UA and unnix error message" into main

Browse source
This commit is contained in:
jade 2024-03-26 20:46:27 +00:00 committed by Gerrit Code Review
parent 207d24da4e 80b66b5065
commit a5254186fd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/filetransfer.cc
View file

@ -296,7 +296,7 @@ struct curlFileTransfer : public FileTransfer
curl_easy_setopt(req, CURLOPT_MAXREDIRS, 10);
curl_easy_setopt(req, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(req, CURLOPT_USERAGENT,
("curl/" LIBCURL_VERSION " Nix/" + nixVersion +
("curl/" LIBCURL_VERSION " Lix/" + nixVersion +
(fileTransferSettings.userAgentSuffix != "" ? " " + fileTransferSettings.userAgentSuffix.get() : "")).c_str());
#if LIBCURL_VERSION_NUM >= 0x072b00
curl_easy_setopt(req, CURLOPT_PIPEWAIT, 1);
@ -724,7 +724,7 @@ struct curlFileTransfer : public FileTransfer
res.data = std::move(*s3Res.data);
callback(std::move(res));
#else
throw nix::Error("cannot download '%s' because Nix is not built with S3 support", request.uri);
throw nix::Error("cannot download '%s' because Lix is not built with S3 support", request.uri);
#endif
} catch (...) { callback.rethrow(); }
return;