File dash-core-newer-boost-fs.patch of Package dash-core

Overview Repositories Revisions Requests Users Attributes Meta

File dash-core-newer-boost-fs.patch of Package dash-core (Revision 83a5feb7bd41b30434bc227062f79f91)

Currently displaying revision 83a5feb7bd41b30434bc227062f79f91 , Show latest

From e456d1678326cd1747cde732c53cda7d4ad3d4e2 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Wed, 19 Jan 2022 15:21:25 -0500
Subject: [PATCH] fs: Make compatible with boost 1.78

---
 src/wallet/load.cpp                   | 2 +-
 test/functional/wallet_multiwallet.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/load.cpp b/src/wallet/load.cpp
index 1f35d2626c..3099880b30 100644
--- a/src/wallet/load.cpp
+++ b/src/wallet/load.cpp
@@ -25,7 +25,7 @@ bool VerifyWallets(interfaces::Chain& chain)
         fs::path wallet_dir = gArgs.GetArg("-walletdir", "");
         boost::system::error_code error;
         // The canonical path cleans the path, preventing >1 Berkeley environment instances for the same directory
-        fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error);
+        fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error).remove_trailing_separator();
         if (error || !fs::exists(wallet_dir)) {
             chain.initError(strprintf(_("Specified -walletdir \"%s\" does not exist"), wallet_dir.string()));
             return false;
diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py
index 5ec99a4233..2c9de11733 100755
--- a/test/functional/wallet_multiwallet.py
+++ b/test/functional/wallet_multiwallet.py
@@ -123,7 +123,7 @@ class MultiWalletTest(BitcoinTestFramework):
 
         # should raise rpc error if wallet path can't be created
         err_code = -4 if self.options.is_sqlite_only else -1
-        assert_raises_rpc_error(err_code, "boost::filesystem::create_directory:", self.nodes[0].createwallet, "w8/bad")
+        assert_raises_rpc_error(err_code, "boost::filesystem::create_director", self.nodes[0].createwallet, "w8/bad")
 
         # check that all requested wallets were created
         self.stop_node(0)
-- 
2.42.0

Places

File dash-core-newer-boost-fs.patch of Package dash-core (Revision 83a5feb7bd41b30434bc227062f79f91)

Places