From ee41022da16d6ad84d3164a2ef27a57dc57c4a2c Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Thu, 22 Aug 2024 11:57:08 +0200 Subject: Remote-execution properties: restore the latest-wins semantics ... that was accidentially replaced by a first-wins semantics in 62d204ff4cc94c12c1635f189255710901682825 which fortunately did not make it to any release. --- src/buildtool/execution_api/remote/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/buildtool/execution_api/remote/config.cpp') diff --git a/src/buildtool/execution_api/remote/config.cpp b/src/buildtool/execution_api/remote/config.cpp index ac211061..7f065296 100644 --- a/src/buildtool/execution_api/remote/config.cpp +++ b/src/buildtool/execution_api/remote/config.cpp @@ -87,7 +87,7 @@ auto RemoteExecutionConfig::Builder::Build() const noexcept for (auto const& property : platform_properties_raw_) { if (auto pair = ParseProperty(property)) { try { - platform_properties.insert(*std::move(pair)); + platform_properties.insert_or_assign(pair->first, pair->second); } catch (std::exception const& e) { return unexpected{fmt::format("Failed to insert property {}", nlohmann::json(property).dump())}; -- cgit v1.2.3