From 80b66b5065b3c4d8bdb6f04b7e29a87833733548 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Tue, 19 Mar 2024 02:32:27 +0100 Subject: [PATCH] libstore/filetransfer: use Lix UA and unnix error message Once this commit lands, we are even more visible in analytics FWIW. Change-Id: Id7e0c162315d0f191edbea9cb5fb82ce363704b9 Signed-off-by: Raito Bezarius --- src/libstore/filetransfer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index 46cda62a1..b843a95f9 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -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;