From 4dbbd721eb9db75d4968a624b8cb9e75e979a144 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Mon, 2 Sep 2024 20:09:35 +0200 Subject: treewide: consistently mark overridden settings as such Only overridden settings are sent to the daemon, and we're going to do the same for the build hook to. It needs to be ensured that overridden settings are in fact consistently marked as such, so that they actually get sent. Change-Id: I7cd58d925702f86cf2c35ad121eb191ceb62a355 --- src/libutil/config.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/libutil/config.cc') diff --git a/src/libutil/config.cc b/src/libutil/config.cc index 778da1413..f600a10ca 100644 --- a/src/libutil/config.cc +++ b/src/libutil/config.cc @@ -32,7 +32,6 @@ bool Config::set(const std::string & name, const std::string & value, const Appl return false; } i->second.setting->set(value, append, options); - i->second.setting->overridden = true; return true; } @@ -46,7 +45,6 @@ void Config::addSetting(AbstractSetting * setting) if (auto i = unknownSettings.find(setting->name); i != unknownSettings.end()) { setting->set(std::move(i->second)); - setting->overridden = true; unknownSettings.erase(i); set = true; } @@ -58,7 +56,6 @@ void Config::addSetting(AbstractSetting * setting) alias, setting->name); else { setting->set(std::move(i->second)); - setting->overridden = true; unknownSettings.erase(i); set = true; } @@ -80,7 +77,7 @@ void AbstractConfig::reapplyUnknownSettings() { auto unknownSettings2 = std::move(unknownSettings); unknownSettings = {}; - for (auto & s : unknownSettings2) + for (auto & s : unknownSettings2) set(s.first, s.second); } -- cgit v1.2.3