From f52c3b345be8e5aa1af8bdebcc70c852bb320568 Mon Sep 17 00:00:00 2001 From: Thomas Mangin Date: Tue, 7 Apr 2020 10:07:35 +0100 Subject: util: T2226: fix merge conflict --- src/conf_mode/protocols_pim.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/conf_mode/protocols_pim.py') 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 -- cgit v1.2.3