From 849671f3d4ea482d208da4b5adf5c2c3556e25e4 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Fri, 28 Jun 2024 12:02:14 +0200 Subject: Pass StorageConfig and Storage to just-mr maps --- src/other_tools/just_mr/launch.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/other_tools/just_mr/launch.cpp') 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 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 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 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) { -- cgit v1.2.3