diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-28 12:02:14 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-07-05 13:32:39 +0200 |
| commit | 849671f3d4ea482d208da4b5adf5c2c3556e25e4 (patch) | |
| tree | c4464ebd7bd88a3785c6337c2788d6e8b449fa22 /src/other_tools/just_mr/launch.cpp | |
| parent | 3c7f2481918289e8d47922df1c87a7ae77357749 (diff) | |
| download | justbuild-849671f3d4ea482d208da4b5adf5c2c3556e25e4.tar.gz | |
Pass StorageConfig and Storage to just-mr maps
Diffstat (limited to 'src/other_tools/just_mr/launch.cpp')
| -rw-r--r-- | src/other_tools/just_mr/launch.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/other_tools/just_mr/launch.cpp b/src/other_tools/just_mr/launch.cpp index cfa45406..9fa2c849 100644 --- a/src/other_tools/just_mr/launch.cpp +++ b/src/other_tools/just_mr/launch.cpp @@ -38,6 +38,8 @@ auto CallJust(std::optional<std::filesystem::path> const& config_file, MultiRepoRemoteAuthArguments const& auth_args, RetryArguments const& retry_args, ForwardOnlyArguments const& launch_fwd, + StorageConfig const& storage_config, + Storage const& storage, bool forward_build_root, std::string multi_repo_tool_name) -> int { // check if subcmd_name can be taken from additional args @@ -62,7 +64,7 @@ auto CallJust(std::optional<std::filesystem::path> const& config_file, if (subcommand and kKnownJustSubcommands.contains(*subcommand)) { // Read the config file if needed if (kKnownJustSubcommands.at(*subcommand).config) { - lock = GarbageCollector::SharedLock(StorageConfig::Instance()); + lock = GarbageCollector::SharedLock(storage_config); if (not lock) { return kExitGenericFailure; } @@ -75,6 +77,8 @@ auto CallJust(std::optional<std::filesystem::path> const& config_file, setup_args, just_cmd_args, auth_args, + storage_config, + storage, /*interactive=*/false, std::move(multi_repo_tool_name)); if (not mr_config_path) { |