ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-31 00:24:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

depot_deploy: do not fail on missing nodes

Browse Source 
If provided with a config that does not include a `<static>` or
`<common_routes>` node, depot_deploy exits due to a `Nonexistent_sub_node`
exception. Instead, we should output a more useful warning.

Fixes genodelabs/genode#4600
This commit is contained in:
Johannes Schlatow 2022-09-02 16:09:37 +02:00 committed by Norman Feske
parent 7d143087c9
commit 4689275845
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
repos/gems/src/app/depot_deploy/main.cc
View File

@ -81,9 +81,12 @@ struct Depot_deploy::Main
if (prio_levels.value)
xml.attribute("prio_levels", prio_levels.value);
Xml_node static_config = config.sub_node("static");
static_config.with_raw_content([&] (char const *start, size_t length) {
xml.append(start, length); });
config.with_sub_node("static",
[&] (Xml_node static_config) {
static_config.with_raw_content([&] (char const *start, size_t length) {
xml.append(start, length); });
},
[&] () { warning("config lacks <static> node"); });
config.with_optional_sub_node("report", [&] (Xml_node const &report) {
@ -127,10 +130,14 @@ struct Depot_deploy::Main
});
});
Child::Depot_rom_server const parent { };
_children.gen_start_nodes(xml, config.sub_node("common_routes"),
prio_levels, Affinity::Space(1, 1),
parent, parent);
config.with_sub_node("common_routes",
[&] (Xml_node node) {
Child::Depot_rom_server const parent { };
_children.gen_start_nodes(xml, node,
prio_levels, Affinity::Space(1, 1),
parent, parent);
},
[&] () { warning("config lacks <common_routes> node"); });
});
/* update query for blueprints of all unconfigured start nodes */