Merge pull request #329 from thomas-mangin/T2226

util: T2226: improvement and fixes

3 files changed, 7 insertions, 6 deletions

diff --git a/src/op_mode/flow_accounting_op.py b/src/op_mode/flow_accounting_op.py
index 7f3ad7476..71fdfc288 100755
--- a/src/op_mode/flow_accounting_op.py
+++ b/src/op_mode/flow_accounting_op.py
@@ -76,7 +76,7 @@ def _uacctd_running():
 # get list of interfaces
 def _get_ifaces_dict():
     # run command to get ifaces list
-    out = cmd('/bin/ip link show', universal_newlines=True)
+    out = cmd('/bin/ip link show')
 
     # read output
     ifaces_out = out.splitlines()
@@ -95,7 +95,6 @@ def _get_ifaces_dict():
 def _get_flows_list():
     # run command to get flows list
     out = cmd(f'/usr/bin/pmacct -s -O json -T flows -p {uacctd_pipefile}',
-                universal_newlines=True,
                 message='Failed to get flows list')
 
     # read output
diff --git a/src/op_mode/powerctrl.py b/src/op_mode/powerctrl.py
index 0f3619411..4ab91384b 100755
--- a/src/op_mode/powerctrl.py
+++ b/src/op_mode/powerctrl.py
@@ -24,6 +24,7 @@ from vyos.util import ask_yes_no
 from vyos.util import cmd
 from vyos.util import call
 from vyos.util import run
+from vyos.util import STDOUT
 
 systemd_sched_file = "/run/systemd/shutdown/scheduled"
 
@@ -97,14 +98,14 @@ def execute_shutdown(time, reboot = True, ask=True):
     chk_vyatta_based_reboots()
     ###
 
-    out = cmd(f'/sbin/shutdown {action} now')
+    out = cmd(f'/sbin/shutdown {action} now', stderr=STDOUT)
     print(out.split(",",1)[0])
     return
   elif len(time) == 1:
     # Assume the argument is just time
     ts = parse_time(time[0])
     if ts:
-      cmd(f'/sbin/shutdown {action} {time[0]}')
+      cmd(f'/sbin/shutdown {action} {time[0]}', stderr=STDOUT)
     else:
       sys.exit("Invalid time \"{0}\". The valid format is HH:MM".format(time[0]))
   elif len(time) == 2:
@@ -115,7 +116,7 @@ def execute_shutdown(time, reboot = True, ask=True):
       t = datetime.combine(ds, ts)
       td = t - datetime.now()
       t2 = 1 + int(td.total_seconds())//60 # Get total minutes
-      cmd('/sbin/shutdown {action} {t2}')
+      cmd('/sbin/shutdown {action} {t2}', stderr=STDOUT)
     else:
       if not ts:
         sys.exit("Invalid time \"{0}\". The valid format is HH:MM".format(time[0]))
diff --git a/src/op_mode/version.py b/src/op_mode/version.py
index fe6ecbae5..8599c958f 100755
--- a/src/op_mode/version.py
+++ b/src/op_mode/version.py
@@ -33,6 +33,7 @@ import vyos.limericks
 from vyos.util import cmd
 from vyos.util import call
 from vyos.util import run
+from vyos.util import DEVNULL
 
 
 parser = argparse.ArgumentParser()
@@ -82,7 +83,7 @@ if __name__ == '__main__':
     # Get hypervisor name, if any
     system_type = "bare metal"
     try:
-        hypervisor = cmd('hvinfo 2>/dev/null')
+        hypervisor = cmd('hvinfo',stderr=DEVNULL)
         system_type = "{0} guest".format(hypervisor)
     except OSError:
         # hvinfo returns 1 if it cannot detect any hypervisor