summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/other_tools/just_mr/main.cpp9
-rw-r--r--src/other_tools/repo_map/repos_to_setup_map.cpp7
2 files changed, 16 insertions, 0 deletions
diff --git a/src/other_tools/just_mr/main.cpp b/src/other_tools/just_mr/main.cpp
index 47ec2633..7b7868d0 100644
--- a/src/other_tools/just_mr/main.cpp
+++ b/src/other_tools/just_mr/main.cpp
@@ -422,6 +422,15 @@ void SetupLogging(MultiRepoLogArguments const& clargs) {
auto const& args_list = cmd_args->List();
args.reserve(args_list.size());
for (auto const& arg : args_list) {
+ if (not arg->IsString()) {
+ Logger::Log(
+ LogLevel::Error,
+ "Configuration-file provided 'just' argument key {} "
+ "must have strings in its list value, but found {}",
+ cmd_name,
+ arg->ToString());
+ std::exit(kExitConfigError);
+ }
args.emplace_back(arg->String());
}
clargs->just_cmd.just_args[cmd_name] = std::move(args);
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 9644d615..94b7bed5 100644
--- a/src/other_tools/repo_map/repos_to_setup_map.cpp
+++ b/src/other_tools/repo_map/repos_to_setup_map.cpp
@@ -434,6 +434,13 @@ void DistdirCheckout(ExpressionPtr const& repo_desc,
// create list of archives to fetch
auto dist_repos_to_fetch = std::make_shared<std::vector<ArchiveContent>>();
for (auto const& dist_repo : distdir_repos) {
+ if (not dist_repo->IsString()) {
+ (*logger)(fmt::format("DistdirCheckout: Unsupported value {} for "
+ "\"repositories\" list entry",
+ dist_repo->ToString()),
+ /*fatal=*/true);
+ return;
+ }
// get name of dist_repo
auto dist_repo_name = dist_repo->String();
// check that repo name exists