diff options
| author | fanquake <fanquake@gmail.com> | 2022-03-07 09:39:47 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-03-07 09:40:11 +0000 |
| commit | cb13ba6d11726b40327d899202050a8cb1d476a1 (patch) | |
| tree | 5c0e8e9a2ccc02f1da61adf7317995c6633592ab | |
| parent | 9b5f674abb0e90280436fbacb8711250cde11773 (diff) | |
| parent | 021c3d892fb6b801143bb433e85f329fd250c97d (diff) | |
| download | bitcoin-cb13ba6d11726b40327d899202050a8cb1d476a1.tar.xz | |
Merge bitcoin/bitcoin#24476: [22.x] fs: Make compatible with boost 1.78
021c3d892fb6b801143bb433e85f329fd250c97d fs: Make compatible with boost 1.78 (Andrew Chow)
Pull request description:
Backports #24104 to the `22.x` branch to fix the build with Boost 1.78.0.
ACKs for top commit:
achow101:
ACK 021c3d892fb6b801143bb433e85f329fd250c97d
gruve-p:
ACK https://github.com/bitcoin/bitcoin/pull/24476/commits/021c3d892fb6b801143bb433e85f329fd250c97d
hebasto:
ACK 021c3d892fb6b801143bb433e85f329fd250c97d
Tree-SHA512: 439c463c36b15a8507d58c3d9c6a02f6dfb209bcc85a8ed39a9cc3fe023530f9f74cc3fd545710b0bb15b4ff6afae802471c6819db7cd851dddd537938e0eef5
| -rw-r--r-- | src/wallet/load.cpp | 2 | ||||
| -rwxr-xr-x | 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 dbf9fd46b6..845fd10182 100644 --- a/src/wallet/load.cpp +++ b/src/wallet/load.cpp @@ -22,7 +22,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 00d2c9ffe4..92e48d4fb7 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -141,7 +141,7 @@ class MultiWalletTest(BitcoinTestFramework): # should raise rpc error if wallet path can't be created err_code = -4 if self.options.descriptors 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) |