diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-08-22 11:57:08 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-08-22 12:06:53 +0200 |
| commit | ee41022da16d6ad84d3164a2ef27a57dc57c4a2c (patch) | |
| tree | 1c4e7ac08854c272d4746763a30c509826955562 /src | |
| parent | df05c8552d53afd7fa5dd46b898a1bdf1e5d142d (diff) | |
| download | justbuild-ee41022da16d6ad84d3164a2ef27a57dc57c4a2c.tar.gz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildtool/execution_api/remote/config.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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())}; |