lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge "libutil/config: fix appendable options not getting marked as overridden" into main

Browse source
This commit is contained in:
alois31 2024-11-09 15:01:53 +00:00 committed by Gerrit Code Review
parent d0e0969810 08a362a540
commit b967f1d5fe
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libutil/config-impl.hh
View file

@ -64,8 +64,6 @@ void BaseSetting<T>::appendOrSet(T newValue, bool append, const ApplyConfigOptio
!trait::appendable, !trait::appendable,
"using default `appendOrSet` implementation with an appendable type"); "using default `appendOrSet` implementation with an appendable type");
assert(!append); assert(!append);
overridden = true;
value = std::move(newValue); value = std::move(newValue);
} }
@ -77,6 +75,7 @@ void BaseSetting<T>::set(const std::string & str, bool append, const ApplyConfig
if (deprecated && (append || parsed != value)) { if (deprecated && (append || parsed != value)) {
warn("deprecated setting '%s' found (set to '%s')", name, str); warn("deprecated setting '%s' found (set to '%s')", name, str);
} }
overridden = true;
appendOrSet(std::move(parsed), append, options); appendOrSet(std::move(parsed), append, options);
} else { } else {
assert(experimentalFeature); assert(experimentalFeature);