From 21b9309363ba122342f28b6de0ea78c48650bdc5 Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Wed, 28 Aug 2024 09:56:49 +0200 Subject: just-mr maps: Fix wrong or missing return conditions --- src/other_tools/repo_map/repos_to_setup_map.cpp | 8 ++++---- src/other_tools/root_maps/content_git_map.cpp | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') 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 853bf549..48074fd4 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.cpp +++ b/src/other_tools/repo_map/repos_to_setup_map.cpp @@ -847,10 +847,10 @@ auto CreateReposToSetupMap( return; } if (not resolved_repo_desc.value()->IsMap()) { - Logger::Log( - LogLevel::Error, - "Config: Repository {} resolves to a non-map description", - nlohmann::json(key).dump()); + (*logger)(fmt::format("Config: Repository {} resolves to a " + "non-map description", + nlohmann::json(key).dump()), + /*fatal=*/true); return; } auto repo_type = (*resolved_repo_desc)->At("type"); diff --git a/src/other_tools/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp index d0b9784c..f46e3940 100644 --- a/src/other_tools/root_maps/content_git_map.cpp +++ b/src/other_tools/root_maps/content_git_map.cpp @@ -639,6 +639,7 @@ void HandleKnownInOlderGenerationAfterImport( (*logger)(fmt::format("Failed to write tree id to file {}", archive_tree_id_file.string()), /*fatal=*/true); + return; } // Now that we also have the the ID-file written, we're in the situation // as if we had a cache hit in the first place. -- cgit v1.2.3