summaryrefslogtreecommitdiff
path: root/src/other_tools/root_maps/distdir_git_map.hpp
diff options
context:
space:
mode:
authorPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2023-01-09 11:10:18 +0100
committerPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2023-01-10 10:38:38 +0100
commit6826bdf8031fa28991283cd6266b545d6dd82bcf (patch)
tree933740f76d510197141f5ebd50e8ff8bf85a192d /src/other_tools/root_maps/distdir_git_map.hpp
parentc9beba5763c98ab0c13e46631aef1e9da1022f0e (diff)
downloadjustbuild-6826bdf8031fa28991283cd6266b545d6dd82bcf.tar.gz
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.
Diffstat (limited to 'src/other_tools/root_maps/distdir_git_map.hpp')
-rw-r--r--src/other_tools/root_maps/distdir_git_map.hpp3
1 files changed, 3 insertions, 0 deletions
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<std::unordered_map<std::string, std::string>> content_list;
+ std::shared_ptr<std::vector<ArchiveContent>> repos_to_fetch;
[[nodiscard]] auto operator==(const DistdirInfo& other) const noexcept
-> bool {
@@ -33,6 +35,7 @@ struct DistdirInfo {
using DistdirGitMap = AsyncMapConsumer<DistdirInfo, nlohmann::json>;
[[nodiscard]] auto CreateDistdirGitMap(
+ gsl::not_null<ContentCASMap*> const& content_cas_map,
gsl::not_null<ImportToGitMap*> const& import_to_git_map,
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
std::size_t jobs) -> DistdirGitMap;