wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Make Machine::systemTypes a set not vector

Browse source 
This is more conceptually correct (the order does not matter), and also
matches what Hydra already does.

(Nix and Hydra matching is needed for dedup
https://github.com/NixOS/hydra/issues/1164)
This commit is contained in:
John Ericson 2024-01-23 12:30:26 -05:00
parent b6aee9a93f
commit 739032762a
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/build-remote/build-remote.cc
View file

@ -139,9 +139,7 @@ static int main_build_remote(int argc, char * * argv)
if (m.enabled
&& (neededSystem == "builtin"
|| std::find(m.systemTypes.begin(),
m.systemTypes.end(),
neededSystem) != m.systemTypes.end()) &&
|| m.systemTypes.count(neededSystem) > 0) &&
m.allSupported(requiredFeatures) &&
m.mandatoryMet(requiredFeatures))
{
@ -214,7 +212,7 @@ static int main_build_remote(int argc, char * * argv)
for (auto & m : machines)
error
% concatStringsSep<std::vector<std::string>>(", ", m.systemTypes)
% concatStringsSep<StringSet>(", ", m.systemTypes)
% m.maxJobs
% concatStringsSep<StringSet>(", ", m.supportedFeatures)
% concatStringsSep<StringSet>(", ", m.mandatoryFeatures);