convert the whole command array to string

Author: Vladimir Kotal

opengrok-tools/src/main/python/opengrok_tools/utils/command.py

@@ -59,7 +59,7 @@ def __init__(self, cmd, args_subst=None, args_append=None, logger=None,
         if isinstance(doprint, list):
             doprint = doprint[0]
 
-        self.cmd = cmd
+        self.cmd = list(map(str, cmd))
         self.state = "notrun"
         self.excl_subst = excl_subst
         self.work_dir = work_dir
@@ -70,6 +70,7 @@ def __init__(self, cmd, args_subst=None, args_append=None, logger=None,
         self.limits = resource_limits
         self.doprint = doprint
         self.err = None
+        self.returncode = None
 
         self.logger = logger or logging.getLogger(__name__)
 
@@ -333,7 +334,6 @@ def fill_arg(self, args_append=None, args_subst=None):
         newcmd = []
         subst_done = -1
         for i, cmdarg in enumerate(self.cmd):
-            cmdarg = str(cmdarg)
             if args_subst:
                 for pattern in args_subst.keys():
                     if pattern in cmdarg:

opengrok-tools/src/test/python/test_command.py

@@ -37,7 +37,7 @@ def test_subst_append_default():
     cmd = Command(['foo', '=ARG=', 33, 'bar'],
                   args_subst={"ARG": "blah"},
                   args_append=["1", "2"])
-    assert cmd.cmd == ['foo', '=blah=', 33, 'bar', '1', '2']
+    assert cmd.cmd == ['foo', '=blah=', '33', 'bar', '1', '2']
 
 
 def test_subst_append_exclsubst():