diff options
| author | John Estabrook <jestabro@vyos.io> | 2024-03-20 21:33:02 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2024-03-21 08:15:51 -0500 |
| commit | 7f7df88bbd4f58845ac272eb855e259eb82505d6 (patch) | |
| tree | 35928d4eda944bfcfbee04695af09fb35799afb7 /src/reference_tree.ml | |
| parent | 84720462dc1d77c7a5fbdf10e9c7db739aef1ce9 (diff) | |
| download | vyos1x-config-7f7df88bbd4f58845ac272eb855e259eb82505d6.tar.gz vyos1x-config-7f7df88bbd4f58845ac272eb855e259eb82505d6.zip | |
T6149: update node_data if necessary when merging nodes
Diffstat (limited to 'src/reference_tree.ml')
| -rw-r--r-- | src/reference_tree.ml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/reference_tree.ml b/src/reference_tree.ml index 302437e..7f6cc25 100644 --- a/src/reference_tree.ml +++ b/src/reference_tree.ml @@ -179,7 +179,12 @@ let rec insert_from_xml basepath reftree xml = let data = {data with node_type=node_type; owner=node_owner; default_value=default_value} in let name = Xml.attrib xml "name" in let path = basepath @ [name] in - let new_tree = Vytree.insert_maybe reftree path data in + let new_tree = + if data <> default_data then + Vytree.insert_or_update reftree path data + else + Vytree.insert_maybe reftree path data + in (match node_type with | Leaf -> new_tree | _ -> |