diff options
| author | Ben Burdette <bburdette@protonmail.com> | 2022-04-28 12:32:57 -0600 |
|---|---|---|
| committer | Ben Burdette <bburdette@protonmail.com> | 2022-04-28 12:32:57 -0600 |
| commit | 6e19947993119dec3c9fb9581150d1184948bae9 (patch) | |
| tree | 978fd122eb69168974a3a90063114b97b976f8f3 /src/libstore/filetransfer.cc | |
| parent | 93b8d315087921b0a024bf87555ac6c3bca6882d (diff) | |
| parent | 4bb111c8d4c5692db2f735c2803f632f8c30b6ab (diff) | |
Merge branch 'master' into debug-merge-master
Diffstat (limited to 'src/libstore/filetransfer.cc')
| -rw-r--r-- | src/libstore/filetransfer.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index c46262299..529a41891 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -443,14 +443,13 @@ struct curlFileTransfer : public FileTransfer : httpStatus != 0 ? FileTransferError(err, std::move(response), - fmt("unable to %s '%s': HTTP error %d ('%s')", - request.verb(), request.uri, httpStatus, statusMsg) - + (code == CURLE_OK ? "" : fmt(" (curl error: %s)", curl_easy_strerror(code))) - ) + "unable to %s '%s': HTTP error %d%s", + request.verb(), request.uri, httpStatus, + code == CURLE_OK ? "" : fmt(" (curl error: %s)", curl_easy_strerror(code))) : FileTransferError(err, std::move(response), - fmt("unable to %s '%s': %s (%d)", - request.verb(), request.uri, curl_easy_strerror(code), code)); + "unable to %s '%s': %s (%d)", + request.verb(), request.uri, curl_easy_strerror(code), code); /* If this is a transient error, then maybe retry the download after a while. If we're writing to a @@ -704,7 +703,7 @@ struct curlFileTransfer : public FileTransfer auto s3Res = s3Helper.getObject(bucketName, key); FileTransferResult res; if (!s3Res.data) - throw FileTransferError(NotFound, {}, "S3 object '%s' does not exist", request.uri); + throw FileTransferError(NotFound, "S3 object '%s' does not exist", request.uri); res.data = std::move(*s3Res.data); callback(std::move(res)); #else |