fix command printing (#2714)

Author: Vladimir Kotal

opengrok-tools/src/main/python/opengrok_tools/scm/cvs.py

@@ -18,7 +18,7 @@
 #
 
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 
 from ..utils.command import Command
@@ -45,7 +45,7 @@ def reposync(self):
         cmd = self.getCommand(hg_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("outout of " + cmd + ":")
+        self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             self.logger.error("failed to perform update: command {}"

opengrok-tools/src/main/python/opengrok_tools/scm/git.py

@@ -18,7 +18,7 @@
 #
 
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 
 from ..utils.command import Command
@@ -45,7 +45,7 @@ def reposync(self):
         cmd = self.getCommand(git_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("output of " + git_command + ":")
+        self.logger.info("output of {}:".format(git_command))
         self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             cmd.log_error("failed to perform pull")
@@ -58,7 +58,7 @@ def incoming(self):
         cmd = self.getCommand(git_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("output of " + git_command + ":")
+        self.logger.info("output of {}:".format(git_command))
         self.logger.info(cmd.geterroutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             cmd.log_error("failed to perform pull")

opengrok-tools/src/main/python/opengrok_tools/scm/mercurial.py

@@ -18,7 +18,7 @@
 #
 
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 
 from ..utils.command import Command
@@ -45,7 +45,7 @@ def get_branch(self):
         cmd = self.getCommand(hg_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("output of " + cmd + ":")
+        self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             cmd.log_error("failed to get branch")
@@ -74,7 +74,7 @@ def reposync(self):
         cmd = self.getCommand(hg_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("output of " + cmd + ":")
+        self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             cmd.log_error("failed to perform pull")
@@ -88,7 +88,7 @@ def reposync(self):
         cmd = self.getCommand(hg_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("output of " + cmd + ":")
+        self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             cmd.log_error("failed to perform pull and update")
@@ -110,7 +110,7 @@ def incoming(self):
         cmd = self.getCommand(hg_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("output of " + cmd + ":")
+        self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
         retcode = cmd.getretcode()
         if cmd.getstate() != Command.FINISHED or retcode not in [0, 1]:

opengrok-tools/src/main/python/opengrok_tools/scm/repo.py

@@ -18,7 +18,7 @@
 #
 
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 
 from ..utils.command import Command
@@ -45,7 +45,7 @@ def reposync(self):
         cmd = self.getCommand(repo_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("output of " + cmd + ":")
+        self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             cmd.log_error("failed to perform sync")
@@ -58,7 +58,7 @@ def incoming(self):
         cmd = self.getCommand(repo_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("output of " + cmd + ":")
+        self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             cmd.log_error("failed to perform sync")

opengrok-tools/src/main/python/opengrok_tools/scm/svn.py

@@ -18,7 +18,7 @@
 #
 
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 
 from ..utils.command import Command
@@ -70,7 +70,7 @@ def reposync(self):
         cmd = self.getCommand(svn_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("output of " + cmd + ":")
+        self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             cmd.log_error("failed to perform update")

opengrok-tools/src/main/python/opengrok_tools/scm/teamware.py

@@ -18,7 +18,7 @@
 #
 
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 
 from ..utils.command import Command
@@ -71,7 +71,7 @@ def reposync(self):
         cmd = self.getCommand(bringover_command, work_dir=self.path,
                               env_vars=self.env, logger=self.logger)
         cmd.execute()
-        self.logger.info("output of " + cmd + ":")
+        self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             cmd.log_error("failed to perform bringover")