diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-26 13:05:35 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-07-05 12:58:35 +0200 |
| commit | 3440784e94de51c95d3dcca8509f8e46b4722ee6 (patch) | |
| tree | 42b096e1766aa3706adf02b93508d721bed66efd /src/other_tools/root_maps/content_git_map.cpp | |
| parent | 595b7c27d175b56bd296b33dc535818a05cdbadd (diff) | |
| download | justbuild-3440784e94de51c95d3dcca8509f8e46b4722ee6.tar.gz | |
Pass Storage and StorageConfig to StorageUtils by reference
Diffstat (limited to 'src/other_tools/root_maps/content_git_map.cpp')
| -rw-r--r-- | src/other_tools/root_maps/content_git_map.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/other_tools/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp index 9c7e2cee..c73d39a5 100644 --- a/src/other_tools/root_maps/content_git_map.cpp +++ b/src/other_tools/root_maps/content_git_map.cpp @@ -182,8 +182,8 @@ void ResolveContentTree( ContentGitMap::LoggerPtr const& logger) { if (key.pragma_special) { // get the resolved tree - auto tree_id_file = - StorageUtils::GetResolvedTreeIDFile(tree_hash, *key.pragma_special); + auto tree_id_file = StorageUtils::GetResolvedTreeIDFile( + StorageConfig::Instance(), tree_hash, *key.pragma_special); if (FileSystemManager::Exists(tree_id_file)) { // read resolved tree id auto resolved_tree_id = FileSystemManager::ReadFile(tree_id_file); @@ -532,7 +532,7 @@ auto CreateContentGitMap( auto /* unused */, auto const& key) { auto archive_tree_id_file = StorageUtils::GetArchiveTreeIDFile( - key.repo_type, key.archive.content); + StorageConfig::Instance(), key.repo_type, key.archive.content); if (FileSystemManager::Exists(archive_tree_id_file)) { // read archive_tree_id from file tree_id_file auto archive_tree_id = @@ -788,8 +788,8 @@ auto CreateContentGitMap( : std::filesystem::path(key.archive.fetch_url) .filename() .string()); - StorageUtils::AddDistfileToCAS(repo_distfile, - just_mr_paths); + StorageUtils::AddDistfileToCAS( + Storage::Instance(), repo_distfile, just_mr_paths); // check if content is in CAS now if (auto content_cas_path = cas.BlobPath(digest, /*is_executable=*/false)) { |