diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildtool/file_system/TARGETS | 2 | ||||
| -rw-r--r-- | src/buildtool/file_system/git_repo.cpp | 4 | ||||
| -rw-r--r-- | src/other_tools/git_operations/TARGETS | 2 | ||||
| -rw-r--r-- | src/other_tools/git_operations/git_repo_remote.cpp | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS index 427e7628..4c56cad3 100644 --- a/src/buildtool/file_system/TARGETS +++ b/src/buildtool/file_system/TARGETS @@ -108,9 +108,9 @@ , ["src/utils/cpp", "path"] , ["src/utils/cpp", "hex_string"] , ["src/utils/cpp", "gsl"] - , ["src/utils/cpp", "tmp_dir"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/common", "common"] + , ["src/buildtool/storage", "config"] ] , "cflags": ["-pthread"] } diff --git a/src/buildtool/file_system/git_repo.cpp b/src/buildtool/file_system/git_repo.cpp index 2022d0b1..eceb5a1d 100644 --- a/src/buildtool/file_system/git_repo.cpp +++ b/src/buildtool/file_system/git_repo.cpp @@ -20,10 +20,10 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/logger.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/utils/cpp/gsl.hpp" #include "src/utils/cpp/hex_string.hpp" #include "src/utils/cpp/path.hpp" -#include "src/utils/cpp/tmp_dir.hpp" extern "C" { #include <git2.h> @@ -1555,7 +1555,7 @@ auto GitRepo::LocalFetchViaTmpRepo(std::string const& repo_path, Logger::Log(LogLevel::Debug, "Branch local fetch called on a real repository"); } - auto tmp_dir = TmpDir::Create("local_fetch"); + auto tmp_dir = StorageConfig::CreateTypedTmpDir("local_fetch"); if (not tmp_dir) { (*logger)("Failed to create temp dir for Git repository", /*fatal=*/true); diff --git a/src/other_tools/git_operations/TARGETS b/src/other_tools/git_operations/TARGETS index 1cd49035..a8f86183 100644 --- a/src/other_tools/git_operations/TARGETS +++ b/src/other_tools/git_operations/TARGETS @@ -31,12 +31,12 @@ , "private-deps": [ ["src/buildtool/logging", "logging"] , ["src/buildtool/file_system", "git_utils"] + , ["src/buildtool/storage", "config"] , ["@", "fmt", "", "fmt"] , ["", "libgit2"] , ["@", "json", "", "json"] , ["src/buildtool/system", "system_command"] , "git_config_settings" - , ["src/utils/cpp", "tmp_dir"] ] } , "git_config_settings": diff --git a/src/other_tools/git_operations/git_repo_remote.cpp b/src/other_tools/git_operations/git_repo_remote.cpp index a64a6de5..5b1a9750 100644 --- a/src/other_tools/git_operations/git_repo_remote.cpp +++ b/src/other_tools/git_operations/git_repo_remote.cpp @@ -18,9 +18,9 @@ #include "nlohmann/json.hpp" #include "src/buildtool/file_system/git_utils.hpp" #include "src/buildtool/logging/logger.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/buildtool/system/system_command.hpp" #include "src/other_tools/git_operations/git_config_settings.hpp" -#include "src/utils/cpp/tmp_dir.hpp" extern "C" { #include <git2.h> @@ -401,7 +401,7 @@ auto GitRepoRemote::UpdateCommitViaTmpRepo( anon_logger_ptr const& logger) const noexcept -> std::optional<std::string> { try { - auto tmp_dir = TmpDir::Create("update"); + auto tmp_dir = StorageConfig::CreateTypedTmpDir("update"); if (not tmp_dir) { (*logger)("Failed to create temp dir for running 'git ls-remote'", /*fatal=*/true); @@ -536,7 +536,7 @@ auto GitRepoRemote::FetchViaTmpRepo(std::string const& repo_url, anon_logger_ptr const& logger) noexcept -> bool { try { - auto tmp_dir = TmpDir::Create("fetch"); + auto tmp_dir = StorageConfig::CreateTypedTmpDir("fetch"); if (not tmp_dir) { (*logger)("Failed to create temp dir for running 'git fetch'", /*fatal=*/true); |