From 9875a21bdb26df19f2faf3e81153dea15e4f9e3c Mon Sep 17 00:00:00 2001 From: Thomas Mangin Date: Thu, 9 Apr 2020 19:08:24 +0100 Subject: util: T2226: os.system was wrongly converted to run os.system does print the ouput of the command, run() does not. A new function called call() does the printing and return the error code. --- src/conf_mode/salt-minion.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/conf_mode/salt-minion.py') diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py index bd1d44bc8..bfc3a707e 100755 --- a/src/conf_mode/salt-minion.py +++ b/src/conf_mode/salt-minion.py @@ -26,7 +26,7 @@ from urllib3 import PoolManager from vyos.config import Config from vyos.defaults import directories as vyos_data_dir from vyos import ConfigError -from vyos.util import run +from vyos.util import call config_file = r'/etc/salt/minion' @@ -126,10 +126,10 @@ def generate(salt): def apply(salt): if salt is not None: - run("sudo systemctl restart salt-minion") + call("sudo systemctl restart salt-minion") else: # Salt access is removed in the commit - run("sudo systemctl stop salt-minion") + call("sudo systemctl stop salt-minion") os.unlink(config_file) return None -- cgit v1.2.3