summaryrefslogtreecommitdiff
path: root/src/helpers
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2020-03-27 16:00:36 -0500
committerJohn Estabrook <jestabro@vyos.io>2020-03-27 16:02:14 -0500
commitf0b3da2b36b8efd97c9fd6ca4e30437a7169b37b (patch)
tree2981f0fed55c0db9526259dc4c945eff3541c39a /src/helpers
parenta0424f9c6a4cf813934d5a3bc877fddae6eb99de (diff)
downloadvyos-1x-f0b3da2b36b8efd97c9fd6ca4e30437a7169b37b.tar.gz
vyos-1x-f0b3da2b36b8efd97c9fd6ca4e30437a7169b37b.zip
merge config: T2169: remove redundant use of show_config
Diffstat (limited to 'src/helpers')
-rwxr-xr-xsrc/helpers/vyos-merge-config.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/helpers/vyos-merge-config.py b/src/helpers/vyos-merge-config.py
index 7ae62cfb3..c5216daa6 100755
--- a/src/helpers/vyos-merge-config.py
+++ b/src/helpers/vyos-merge-config.py
@@ -70,10 +70,7 @@ with tempfile.NamedTemporaryFile() as file_to_migrate:
merge_config_tree = ConfigTree(config_file)
effective_config = Config()
-
-output_effective_config = effective_config.show_config()
-
-effective_config_tree = ConfigTree(output_effective_config)
+effective_config_tree = effective_config._running_config
effective_cmds = effective_config_tree.to_commands()
merge_cmds = merge_config_tree.to_commands()