summaryrefslogtreecommitdiff
path: root/src/other_tools/repo_map
diff options
context:
space:
mode:
authorPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-02-23 16:35:34 +0100
committerPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-02-27 14:35:44 +0100
commit0e913dd3eee248bccf2b26161ca0a715d039e716 (patch)
tree3bfac4df42c9759dfe60cb7621ad782d422b7674 /src/other_tools/repo_map
parent842145ff59594be8624390e22d815c71bc5c85d6 (diff)
downloadjustbuild-0e913dd3eee248bccf2b26161ca0a715d039e716.tar.gz
just-mr setup archive: Local roots require the archive blob to be local too
For archive repositories we need to ensure that a non-absent root is backed by an archive content blob in the local CAS, in order to also keep the proper root tree file associations. This change also simplifies the content_cas_map logic by removing the previous separation of implementation logic between fetching and setting up the workspace root.
Diffstat (limited to 'src/other_tools/repo_map')
-rw-r--r--src/other_tools/repo_map/repos_to_setup_map.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp
index aec57868..7d0762c8 100644
--- a/src/other_tools/repo_map/repos_to_setup_map.cpp
+++ b/src/other_tools/repo_map/repos_to_setup_map.cpp
@@ -297,8 +297,7 @@ void ArchiveCheckout(ExpressionPtr const& repo_desc,
.sha512 = repo_desc_sha512->IsString()
? std::make_optional(repo_desc_sha512->String())
: std::nullopt,
- .origin = repo_name,
- .fetch_only = false},
+ .origin = repo_name},
.repo_type = repo_type,
.subdir = subdir.empty() ? "." : subdir.string(),
.pragma_special = pragma_special_value,
@@ -617,8 +616,7 @@ void DistdirCheckout(ExpressionPtr const& repo_desc,
.sha512 = repo_desc_sha512->IsString()
? std::make_optional(repo_desc_sha512->String())
: std::nullopt,
- .origin = dist_repo_name,
- .fetch_only = true};
+ .origin = dist_repo_name};
// add to distdir content map
auto repo_distfile =