summaryrefslogtreecommitdiff
path: root/src/other_tools/just_mr/fetch.cpp
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2024-01-24 09:55:31 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2024-01-24 18:57:50 +0100
commit617fad94f3ea4566ad4124d2a3731d633bd84b9d (patch)
treecbb038a0228f839a7262add5f2d10c98e31a2d87 /src/other_tools/just_mr/fetch.cpp
parentf6c2fe3e30bc5e92e2c8134fb2135a532788bc3b (diff)
downloadjustbuild-617fad94f3ea4566ad4124d2a3731d633bd84b9d.tar.gz
just-mr: in to_git warning, report actual tool names
... instead of some hard-coded strings, as that can be confusing when the tool is packaged under a different name.
Diffstat (limited to 'src/other_tools/just_mr/fetch.cpp')
-rw-r--r--src/other_tools/just_mr/fetch.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/other_tools/just_mr/fetch.cpp b/src/other_tools/just_mr/fetch.cpp
index 47b4586c..853cd233 100644
--- a/src/other_tools/just_mr/fetch.cpp
+++ b/src/other_tools/just_mr/fetch.cpp
@@ -37,7 +37,8 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
MultiRepoCommonArguments const& common_args,
MultiRepoSetupArguments const& setup_args,
MultiRepoFetchArguments const& fetch_args,
- MultiRepoRemoteAuthArguments const& auth_args) -> int {
+ MultiRepoRemoteAuthArguments const& auth_args,
+ std::string multi_repository_tool_name) -> int {
// provide report
Logger::Log(LogLevel::Info, "Performing repositories fetch");
@@ -491,9 +492,11 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
&ts,
archives_to_fetch,
[]([[maybe_unused]] auto const& values) {},
- [&failed_archives](auto const& msg, bool fatal) {
+ [&failed_archives, &multi_repository_tool_name](auto const& msg,
+ bool fatal) {
Logger::Log(fatal ? LogLevel::Error : LogLevel::Warning,
- "While performing just-mr fetch:\n{}",
+ "While performing {} fetch:\n{}",
+ multi_repository_tool_name,
msg);
failed_archives = failed_archives or fatal;
});
@@ -505,9 +508,11 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
&ts,
git_trees_to_fetch,
[]([[maybe_unused]] auto const& values) {},
- [&failed_git_trees](auto const& msg, bool fatal) {
+ [&failed_git_trees, &multi_repository_tool_name](auto const& msg,
+ bool fatal) {
Logger::Log(fatal ? LogLevel::Error : LogLevel::Warning,
- "While performing just-mr fetch:\n{}",
+ "While performing {} fetch:\n{}",
+ multi_repository_tool_name,
msg);
failed_git_trees = failed_git_trees or fatal;
});