aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md3
-rw-r--r--src/zenserver/projectstore/projectstore.cpp14
2 files changed, 13 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc0664bd5..610e61b12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
##
+- Bugfix: Parsing of `zen oplog-import` `--oidctoken-exe-path` option fixed
+
+## 5.7.4
- Bugfix: Parsing of `zen builds` `--log-progress` option fixed
- Bugfix: Rebuild State phase of `zen builds download` could read out of bound for target path array
- Bugfix: Don't include oplogs pending delete when scanning for oplogs
diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 0fe66bdf1..181177653 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -216,11 +216,14 @@ namespace {
if (std::string_view OidcExePathString = Cloud["oidc-exe-path"].AsString(); !OidcExePathString.empty())
{
std::filesystem::path OidcExePathMaybe(OidcExePathString);
- if (!IsFile(OidcExePathMaybe))
+ if (IsFile(OidcExePathMaybe))
{
- ZEN_WARN("Path to OidcToken executable '{}' can not be reached by server", OidcExePathString);
OidcExePath = std::move(OidcExePathMaybe);
}
+ else
+ {
+ ZEN_WARN("Path to OidcToken executable '{}' can not be reached by server", OidcExePathString);
+ }
}
std::string_view KeyParam = Cloud["key"sv].AsString();
if (KeyParam.empty())
@@ -326,11 +329,14 @@ namespace {
if (std::string_view OidcExePathString = Builds["oidc-exe-path"].AsString(); !OidcExePathString.empty())
{
std::filesystem::path OidcExePathMaybe(OidcExePathString);
- if (!IsFile(OidcExePathMaybe))
+ if (IsFile(OidcExePathMaybe))
{
- ZEN_WARN("Path to OidcToken executable '{}' can not be reached by server", OidcExePathString);
OidcExePath = std::move(OidcExePathMaybe);
}
+ else
+ {
+ ZEN_WARN("Path to OidcToken executable '{}' can not be reached by server", OidcExePathString);
+ }
}
std::string_view BuildIdParam = Builds["buildsid"sv].AsString();
if (BuildIdParam.empty())