summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Mangin <thomas.mangin@exa.net.uk>2020-04-07 10:07:35 +0100
committerThomas Mangin <thomas.mangin@exa.net.uk>2020-04-07 10:14:47 +0100
commitf52c3b345be8e5aa1af8bdebcc70c852bb320568 (patch)
treeeba1fc570ee7bbf8f32c257c0289f6cc59d991be /src
parent09ad28b28c9ebd9308cfe9048686b3b0ef9cfd9c (diff)
downloadvyos-1x-f52c3b345be8e5aa1af8bdebcc70c852bb320568.tar.gz
vyos-1x-f52c3b345be8e5aa1af8bdebcc70c852bb320568.zip
util: T2226: fix merge conflict
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/protocols_bfd.py11
-rwxr-xr-xsrc/conf_mode/protocols_pim.py6
2 files changed, 2 insertions, 15 deletions
diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py
index 52a9e54c2..a62d2158e 100755
--- a/src/conf_mode/protocols_bfd.py
+++ b/src/conf_mode/protocols_bfd.py
@@ -207,16 +207,7 @@ def apply(bfd):
if bfd is None:
return None
-<<<<<<< HEAD
- os.system(f'vtysh -d bfdd -f {config_file}')
-=======
- tmpl = jinja2.Template(config_tmpl)
- config_text = tmpl.render(bfd)
- with open(config_file, 'w') as f:
- f.write(config_text)
-
- run("sudo vtysh -d bfdd -f " + config_file)
->>>>>>> util: T2226: covert most calls from os.system to util
+ run("vtysh -d bfdd -f " + config_file)
if os.path.exists(config_file):
os.remove(config_file)
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py
index 0e22d3a6b..9b74fe992 100755
--- a/src/conf_mode/protocols_pim.py
+++ b/src/conf_mode/protocols_pim.py
@@ -132,11 +132,7 @@ def apply(pim):
return None
if os.path.exists(config_file):
-<<<<<<< HEAD
- os.system("vtysh -d pimd -f " + config_file)
-=======
- run("sudo vtysh -d pimd -f " + config_file)
->>>>>>> util: T2226: covert most calls from os.system to util
+ run("vtysh -d pimd -f " + config_file)
os.remove(config_file)
return None