summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-04-20 17:17:21 +0200
committerChristian Poessinger <christian@poessinger.com>2022-04-20 17:17:21 +0200
commit1fe3123a1b898d58d4216953bf2f4bb405d754c8 (patch)
tree379f688ea3366c6e461e486e99b5d53e3bf8e227
parente36efa6b5df764982678a470b7aa82a33c1c369c (diff)
downloadvyos-1x-1fe3123a1b898d58d4216953bf2f4bb405d754c8.tar.gz
vyos-1x-1fe3123a1b898d58d4216953bf2f4bb405d754c8.zip
Revert "vyos.configdict(): T4369: bugfix - execution order in leaf_node_changed()"
This reverts commit 1a1094c28e32c3d6d072cf14a38aa631d51b8aee.
-rw-r--r--python/vyos/configdict.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index d6718a6e2..f96399071 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -129,6 +129,9 @@ def leaf_node_changed(conf, path):
if old is None and isinstance(new, dict):
# valueLess nodes return {} if node was added
return True
+ if old is None and new is not None:
+ # node was added to the CLI, e.g. OpenVPN node "openvpn-options"
+ return True
if old is None:
return []
if isinstance(old, str):
@@ -139,9 +142,6 @@ def leaf_node_changed(conf, path):
elif isinstance(new, type(None)):
new = []
return list_diff(old, new)
- if old is None and new is not None:
- # node was added to the CLI
- return True
return None