experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Three errors in new upgrade code: DEL didnt work, empty config did now work, neither did no yang files in a dir

Browse source
This commit is contained in:
Olof hagsand 2020-06-27 13:02:04 +02:00
parent 8f1de15ad3
commit c2e459e8bb
5 changed files with 329 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/backend/backend_commit.c
View file

@ -195,11 +195,6 @@ startup_common(clicon_handle h,
/* Clear flags xpath for get */
xml_apply0(xt, CX_ELMNT, (xml_applyfn_t*)xml_flag_reset,
(void*)(XML_FLAG_MARK|XML_FLAG_CHANGE));
if (xml_child_nr(xt) == 0){ /* If empty skip */
td->td_target = xt;
xt = NULL;
goto ok;
}
/* Here xt is old syntax */
/* General purpose datastore upgrade */
if (clixon_plugin_datastore_upgrade_all(h, db, xt, msdiff) < 0)
@ -211,6 +206,12 @@ startup_common(clicon_handle h,
if (ret == 0)
goto fail;
}
/* If empty skip. Note upgrading can add children, so it may be empty before that. */
if (xml_child_nr(xt) == 0){
td->td_target = xt;
xt = NULL;
goto ok;
}
if ((yspec = clicon_dbspec_yang(h)) == NULL){
clicon_err(OE_YANG, 0, "Yang spec not set");
goto done;