From a68198f9bf18b76526c44d30af54cf85acd70972 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Fri, 10 Apr 2020 10:45:30 -0500
Subject: util: T2253: fix translation to cmd
---
src/helpers/vyos-merge-config.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src/helpers')
diff --git a/src/helpers/vyos-merge-config.py b/src/helpers/vyos-merge-config.py
index 6546c03e3..14df2734b 100755
--- a/src/helpers/vyos-merge-config.py
+++ b/src/helpers/vyos-merge-config.py
@@ -23,7 +23,7 @@ import vyos.remote
from vyos.config import Config
from vyos.configtree import ConfigTree
from vyos.migrator import Migrator, VirtualMigrator
-from vyos.util import cmd
+from vyos.util import cmd, DEVNULL
if (len(sys.argv) < 2):
@@ -99,9 +99,9 @@ if (len(sys.argv) > 2):
if path:
add_cmds = [ cmd for cmd in add_cmds if path in cmd ]
-for cmd in add_cmds:
+for add in add_cmds:
try:
- cmd(f'/opt/vyatta/sbin/my_{cmd}', message='Called process error')
+ cmd(f'/opt/vyatta/sbin/my_{add}', shell=True, stderr=DEVNULL)
except OSError as err:
print(err)
--
cgit v1.2.3