diff options
| author | Dan Engelbrecht <[email protected]> | 2025-04-23 14:14:27 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-04-23 14:14:27 +0200 |
| commit | 37d3a1b76ef256431f3883853fd625dc33b7a991 (patch) | |
| tree | 35646d6cdf4d1f6c7f83b7cced432bd0551d7486 /src | |
| parent | Make plugin loading errors non fatal (#364) (diff) | |
| download | zen-37d3a1b76ef256431f3883853fd625dc33b7a991.tar.xz zen-37d3a1b76ef256431f3883853fd625dc33b7a991.zip | |
parse system dir for builds (#365)
* make sure we always parse system options for zen builds command
* make MakeSafeAbsolutePath nodiscard
Diffstat (limited to 'src')
| -rw-r--r-- | src/zen/cmds/builds_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/zenutil/include/zenutil/commandlineoptions.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp index 43e0ed689..b113ce6d1 100644 --- a/src/zen/cmds/builds_cmd.cpp +++ b/src/zen/cmds/builds_cmd.cpp @@ -9185,6 +9185,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) } MakeSafeAbsolutePathÍnPlace(m_SystemRootDir); }; + ParseSystemOptions(); auto ParseStorageOptions = [&]() { if (!m_OverrideHost.empty() || !m_Host.empty()) @@ -9244,7 +9245,6 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) }; auto ParseAuthOptions = [&]() { - ParseSystemOptions(); if (!m_OpenIdProviderUrl.empty() && !m_OpenIdClientId.empty()) { CreateAuthMgr(); diff --git a/src/zenutil/include/zenutil/commandlineoptions.h b/src/zenutil/include/zenutil/commandlineoptions.h index 3afbac854..b7581f6cd 100644 --- a/src/zenutil/include/zenutil/commandlineoptions.h +++ b/src/zenutil/include/zenutil/commandlineoptions.h @@ -17,11 +17,11 @@ ZEN_THIRD_PARTY_INCLUDES_END namespace zen { -std::vector<std::string> ParseCommandLine(std::string_view CommandLine); -std::vector<char*> StripCommandlineQuotes(std::vector<std::string>& InOutArgs); -void MakeSafeAbsolutePathÍnPlace(std::filesystem::path& Path); -std::filesystem::path MakeSafeAbsolutePath(const std::filesystem::path& Path); -std::filesystem::path StringToPath(const std::string_view& Path); +std::vector<std::string> ParseCommandLine(std::string_view CommandLine); +std::vector<char*> StripCommandlineQuotes(std::vector<std::string>& InOutArgs); +void MakeSafeAbsolutePathÍnPlace(std::filesystem::path& Path); +[[nodiscard]] std::filesystem::path MakeSafeAbsolutePath(const std::filesystem::path& Path); +std::filesystem::path StringToPath(const std::string_view& Path); void commandlineoptions_forcelink(); // internal |