phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cleanup -includeconf error message

Browse source 
Remove the erroneous trailing newline '\n'. Also, print only the first
value to remove needless redundancy in the error message.

Github-Pull: #22002
Rebased-From: fad0867d6a
This commit is contained in:
MarcoFalke 2021-05-20 13:46:15 +02:00 • committed by fanquake
parent 70eac6fcd0
commit 513613d8a8
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/util/system.cpp
View file

@ -337,14 +337,12 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
}
// we do not allow -includeconf from command line
bool success = true;
if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {
for (const auto& include : util::SettingsSpan(*includes)) {
error += "-includeconf cannot be used from commandline; -includeconf=" + include.write() + "\n";
success = false;
}
const auto& include{*util::SettingsSpan(*includes).begin()}; // pick first value as example
error = "-includeconf cannot be used from commandline; -includeconf=" + include.write();
return false;
}
return success;
return true;
}
Optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) const

2
test/functional/feature_includeconf.py
View file

@ -48,7 +48,7 @@ class IncludeConfTest(BitcoinTestFramework):
expected_msg='Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf=true',
)
self.nodes[0].assert_start_raises_init_error(
extra_args=['-includeconf=relative2.conf'],
extra_args=['-includeconf=relative2.conf', '-includeconf=no_warn.conf'],
expected_msg='Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf="relative2.conf"',
)