From 004570a377b2df355064d48afc54375690c3cdb0 Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Tue, 16 Jun 2020 15:14:11 -0400
Subject: Add HTTP responses to FileTransferErrors

---
 src/libstore/filetransfer.hh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/libstore/filetransfer.hh')

diff --git a/src/libstore/filetransfer.hh b/src/libstore/filetransfer.hh
index 11dca2fe0..8e31a9e42 100644
--- a/src/libstore/filetransfer.hh
+++ b/src/libstore/filetransfer.hh
@@ -103,9 +103,10 @@ class FileTransferError : public Error
 {
 public:
     FileTransfer::Error error;
+    std::shared_ptr<string> response; // intentionally optional
     template<typename... Args>
-    FileTransferError(FileTransfer::Error error, const Args & ... args)
-        : Error(args...), error(error)
+    FileTransferError(FileTransfer::Error error, std::shared_ptr<string> response, const Args & ... args)
+        : Error(args...), error(error), response(response)
     { }
 };
 
-- 
cgit v1.2.3


From 74b219ef6e5e171c56c8ad7385969e0d0df09ed8 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 18 Jun 2020 14:48:45 +0000
Subject: Adjust FileTransferError message to use opt response

---
 src/libstore/filetransfer.hh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/libstore/filetransfer.hh')

diff --git a/src/libstore/filetransfer.hh b/src/libstore/filetransfer.hh
index 8e31a9e42..25ade0add 100644
--- a/src/libstore/filetransfer.hh
+++ b/src/libstore/filetransfer.hh
@@ -104,10 +104,11 @@ class FileTransferError : public Error
 public:
     FileTransfer::Error error;
     std::shared_ptr<string> response; // intentionally optional
+
     template<typename... Args>
-    FileTransferError(FileTransfer::Error error, std::shared_ptr<string> response, const Args & ... args)
-        : Error(args...), error(error), response(response)
-    { }
+    FileTransferError(FileTransfer::Error error, std::shared_ptr<string> response, const Args & ... args);
+
+    virtual const char* sname() const override { return "FileTransferError"; }
 };
 
 bool isUri(const string & s);
-- 
cgit v1.2.3