Cleanup -includeconf error message

MarcoFalke · MarcoFalke · commit fad0867d6ab9 · 2021-05-21T10:54:12.000+02:00
Remove the erroneous trailing newline '\n'. Also, print only the first
value to remove needless redundancy in the error message.
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -366,14 +366,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;
 }
 
 std::optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) const
diff --git a/test/functional/feature_includeconf.py b/test/functional/feature_includeconf.py
@@ -47,7 +47,7 @@ def run_test(self):
             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"',
         )
 

Original file line number	Diff line number	Diff line change
`@@ -366,14 +366,12 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`// we do not allow -includeconf from command line`
`369`		`- bool success = true;`
`370`	`369`	`if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {`
`371`		`- for (const auto& include : util::SettingsSpan(*includes)) {`
`372`		`- error += "-includeconf cannot be used from commandline; -includeconf=" + include.write() + "\n";`
`373`		`- success = false;`
`374`		`- }`
	`370`	`+ const auto& include{util::SettingsSpan(includes).begin()}; // pick first value as example`
	`371`	`+ error = "-includeconf cannot be used from commandline; -includeconf=" + include.write();`
	`372`	`+ return false;`
`375`	`373`	`}`
`376`		`- return success;`
	`374`	`+ return true;`
`377`	`375`	`}`
`378`	`376`
`379`	`377`	`std::optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) const`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ def run_test(self):`
`47`	`47`	`expected_msg='Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf=true',`
`48`	`48`	`)`
`49`	`49`	`self.nodes[0].assert_start_raises_init_error(`
`50`		`- extra_args=['-includeconf=relative2.conf'],`
	`50`	`+ extra_args=['-includeconf=relative2.conf', '-includeconf=no_warn.conf'],`
`51`	`51`	`expected_msg='Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf="relative2.conf"',`
`52`	`52`	`)`
`53`	`53`