From 5f18d337d4a3e5bd37d86576e966b8a0ee83237c Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 20 May 2021 13:46:15 +0200
Subject: [PATCH] Cleanup -includeconf error message

Remove the erroneous trailing newline '\n'. Also, print only the first
value to remove needless redundancy in the error message.
---
 src/util/system.cpp                    | 10 ++++------
 test/functional/feature_includeconf.py |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/util/system.cpp b/src/util/system.cpp
index 4bc5a2236e..0acb99dc17 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -325,14 +325,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
diff --git a/test/functional/feature_includeconf.py b/test/functional/feature_includeconf.py
index 4ad916dc77..5c591de00a 100755
--- a/test/functional/feature_includeconf.py
+++ b/test/functional/feature_includeconf.py
@@ -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"',
         )