From 6826bdf8031fa28991283cd6266b545d6dd82bcf Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Mon, 9 Jan 2023 11:10:18 +0100 Subject: Just-MR: Fix distdir computation in internal just-mr This provides the fix already performed for the just-mr script in the internal just-mr as well. In short, this fix makes sure that the computation of the content key for distdir repositories is independent of the presence of the respective archives in CAS. --- src/other_tools/root_maps/distdir_git_map.hpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/other_tools/root_maps/distdir_git_map.hpp') diff --git a/src/other_tools/root_maps/distdir_git_map.hpp b/src/other_tools/root_maps/distdir_git_map.hpp index 91c26ad5..8afeb3d9 100644 --- a/src/other_tools/root_maps/distdir_git_map.hpp +++ b/src/other_tools/root_maps/distdir_git_map.hpp @@ -16,11 +16,13 @@ #define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_DISTDIR_GIT_MAP_HPP #include "nlohmann/json.hpp" +#include "src/other_tools/ops_maps/content_cas_map.hpp" #include "src/other_tools/ops_maps/import_to_git_map.hpp" struct DistdirInfo { std::string content_id; /* key */ std::shared_ptr> content_list; + std::shared_ptr> repos_to_fetch; [[nodiscard]] auto operator==(const DistdirInfo& other) const noexcept -> bool { @@ -33,6 +35,7 @@ struct DistdirInfo { using DistdirGitMap = AsyncMapConsumer; [[nodiscard]] auto CreateDistdirGitMap( + gsl::not_null const& content_cas_map, gsl::not_null const& import_to_git_map, gsl::not_null const& critical_git_op_map, std::size_t jobs) -> DistdirGitMap; -- cgit v1.2.3