From 23b0ba34c6e9d3a75f48297280085fc04b78b4b7 Mon Sep 17 00:00:00 2001 From: Tishj Date: Mon, 20 Oct 2025 22:52:05 +0200 Subject: [PATCH 1/2] apply fix.patch --- src/s3fs.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/s3fs.cpp b/src/s3fs.cpp index 2a92f22..dd7e692 100644 --- a/src/s3fs.cpp +++ b/src/s3fs.cpp @@ -900,7 +900,7 @@ void S3FileHandle::Initialize(optional_ptr opener) { } else { extra_text = S3FileSystem::GetS3AuthError(auth_params); } - throw Exception(error.Type(), error.RawMessage() + extra_text, extra_info); + throw Exception(extra_info, error.Type(), error.RawMessage() + extra_text); } } throw; @@ -936,13 +936,13 @@ bool S3FileSystem::CanHandleFile(const string &fpath) { void S3FileSystem::RemoveFile(const string &path, optional_ptr opener) { auto handle = OpenFile(path, FileFlags::FILE_FLAGS_NULL_IF_NOT_EXISTS, opener); if (!handle) { - throw IOException("Could not remove file \"%s\": %s", {{"errno", "404"}}, path, "No such file or directory"); + throw IOException({{"errno", "404"}}, "Could not remove file \"%s\": %s", path, "No such file or directory"); } auto &s3fh = handle->Cast(); auto res = DeleteRequest(*handle, s3fh.path, {}); if (res->status != HTTPStatusCode::OK_200 && res->status != HTTPStatusCode::NoContent_204) { - throw IOException("Could not remove file \"%s\": %s", {{"errno", to_string(static_cast(res->status))}}, + throw IOException({{"errno", to_string(static_cast(res->status))}}, "Could not remove file \"%s\": %s", path, res->GetError()); } } From 48d66ca089e67e4d748f9aa38933c60c37a3d65c Mon Sep 17 00:00:00 2001 From: Tishj Date: Mon, 20 Oct 2025 22:55:52 +0200 Subject: [PATCH 2/2] this was missed in the patch somehow? --- src/s3fs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s3fs.cpp b/src/s3fs.cpp index dd7e692..c7041e4 100644 --- a/src/s3fs.cpp +++ b/src/s3fs.cpp @@ -890,7 +890,7 @@ void S3FileHandle::Initialize(optional_ptr opener) { if (entry->second == "400") { // 400: BAD REQUEST auto extra_text = S3FileSystem::GetS3BadRequestError(auth_params); - throw Exception(error.Type(), error.RawMessage() + extra_text, extra_info); + throw Exception(extra_info, error.Type(), error.RawMessage() + extra_text); } if (entry->second == "403") { // 403: FORBIDDEN