diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-08-28 09:56:49 +0200 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-08-29 09:09:26 +0200 |
| commit | 21b9309363ba122342f28b6de0ea78c48650bdc5 (patch) | |
| tree | 0c2bf044624652d14c153c637b7bf88aec57beca | |
| parent | c70ce16da685a4972145a42b3aa6d37a67dc56b1 (diff) | |
| download | justbuild-21b9309363ba122342f28b6de0ea78c48650bdc5.tar.gz | |
just-mr maps: Fix wrong or missing return conditions
| -rw-r--r-- | src/other_tools/repo_map/repos_to_setup_map.cpp | 8 | ||||
| -rw-r--r-- | src/other_tools/root_maps/content_git_map.cpp | 1 |
2 files changed, 5 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 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. |