config/File: allow overriding top-level settings in includes

Remove the error message and instead erase the old setting if the "repeatable" flag is not set. https://github.com/MusicPlayerDaemon/MPD/issues/684

config/File: allow overriding top-level settings in includes
4f11fa0d · Max Kellermann · ce7ec2b3 · 4f11fa0d · 4f11fa0d
Commit 4f11fa0d authored Jan 17, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

NEWS NEWS +2 -0

File.cxx src/config/File.cxx +3 -5

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.19 (not yet released)
+* configuration
+  - allow overriding top-level settings in includes
 * output
  - pulse: obey Pulse's maximum sample rate (fixes DSD128 playback)
 * fix build failure with clang 10

--- a/src/config/File.cxx
+++ b/src/config/File.cxx
@@ -153,11 +153,9 @@ ReadConfigParam(ConfigData &config_data, BufferedReader &reader,
 			      name, reader.GetLineNumber());

 	if (!option.repeatable)
-		if (const auto *param = config_data.GetParam(o))
-			throw FormatRuntimeError("config parameter \"%s\" is first defined "
-						 "on line %d and redefined on line %u\n",
-						 name, param->line,
-						 reader.GetLineNumber());
+		/* if the option is not repeatable, override the old
+		   value by removing it first */
+		config_data.GetParamList(o).clear();

 	/* now parse the block or the value */