diff options
| author | Joe Kirchoff <[email protected]> | 2021-12-01 15:41:34 -0800 |
|---|---|---|
| committer | Joe Kirchoff <[email protected]> | 2021-12-01 15:41:34 -0800 |
| commit | 548091b488f66e229f459932c3b79aafeb5f1872 (patch) | |
| tree | 2708583a2f22306d51692a8d9de8d5b21688efd4 /zenserver/upstream/upstreamapply.cpp | |
| parent | Remove throw missed in last commit (diff) | |
| download | zen-548091b488f66e229f459932c3b79aafeb5f1872.tar.xz zen-548091b488f66e229f459932c3b79aafeb5f1872.zip | |
Use 'Platform' instead of 'OSFamily' for Horde condition
Diffstat (limited to 'zenserver/upstream/upstreamapply.cpp')
| -rw-r--r-- | zenserver/upstream/upstreamapply.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/zenserver/upstream/upstreamapply.cpp b/zenserver/upstream/upstreamapply.cpp index e34781eb0..de646a5bb 100644 --- a/zenserver/upstream/upstreamapply.cpp +++ b/zenserver/upstream/upstreamapply.cpp @@ -824,18 +824,10 @@ namespace detail { bool Exclusive = ApplyRecord.WorkerDescriptor["exclusive"sv].AsBool(); // TODO: Remove override when Horde accepts the UE style Host Platforms (Win64, Linux, Mac) - std::string Condition; - if (HostPlatform == "Win64" || HostPlatform == "Windows") + std::string Condition = "Platform == '{}'"_format(HostPlatform); + if (HostPlatform == "Win64") { - Condition = "OSFamily == 'Windows' && Pool == 'Win-RemoteExec'"; - } - else if (HostPlatform == "Mac") - { - Condition = "OSFamily == 'MacOS'"; - } - else - { - Condition = "OSFamily == '{}'"_format(HostPlatform); + Condition += " && Pool == 'Win-RemoteExec'"; } std::map<std::string_view, int64_t> Resources; |