Merge tag 'v0.21.19'

release v0.21.19
This commit is contained in:
Max Kellermann
2020-01-17 15:58:11 +01:00
4 changed files with 24 additions and 19 deletions

View File

@@ -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 */