Skip to content

Commit b1281b5

Browse files
author
MarcoFalke
committed
Merge #21516: remove unnecessary newline from initWarning() argument
804ac10 remove unnecessary newline from initWarning() argument (Larry Ruane) Pull request description: Run: `src/bitcoind -wallet=nosuchfile` Without this patch, `debug.log` contains: ``` 2021-03-23T21:19:16Z init message: Verifying wallet(s)... 2021-03-23T21:19:16Z Warning: Skipping -wallet path that doesn't exist. Failed to load database path '/home/larry/.bitcoin/wallets/nosuchfile'. Path does not exist. 2021-03-23T21:19:16Z init message: Loading banlist... ``` With this patch, the empty line isn't present. This PR fixes a similar problem with `src/bitcoind -conf=nosuchfile` ACKs for top commit: practicalswift: cr ACK 804ac10: patch looks correct! jarolrod: tACK 804ac10, nice catch! theStack: Code-review ACK 804ac10 Tree-SHA512: dfcbaaa72ca24ac40233ac56840cfba8827853711d3df6e229ce940686f2ebf8bf0560bafcaa73a4d82d179a5050af0d3cabdc47b3b1dfd6aaadf718a6635f11
2 parents f67b5dc + 804ac10 commit b1281b5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA
13081308
LogPrintf("Config file: %s\n", config_file_path.string());
13091309
} else if (args.IsArgSet("-conf")) {
13101310
// Warn if no conf file exists at path provided by user
1311-
InitWarning(strprintf(_("The specified config file %s does not exist\n"), config_file_path.string()));
1311+
InitWarning(strprintf(_("The specified config file %s does not exist"), config_file_path.string()));
13121312
} else {
13131313
// Not categorizing as "Warning" because it's the default behavior
13141314
LogPrintf("Config file: %s (not found, skipping)\n", config_file_path.string());

src/wallet/load.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ bool VerifyWallets(interfaces::Chain& chain)
7676
bilingual_str error_string;
7777
if (!MakeWalletDatabase(wallet_file, options, status, error_string)) {
7878
if (status == DatabaseStatus::FAILED_NOT_FOUND) {
79-
chain.initWarning(Untranslated(strprintf("Skipping -wallet path that doesn't exist. %s\n", error_string.original)));
79+
chain.initWarning(Untranslated(strprintf("Skipping -wallet path that doesn't exist. %s", error_string.original)));
8080
} else {
8181
chain.initError(error_string);
8282
return false;

0 commit comments

Comments
 (0)