nicer logs

Author: Vladimir Kotal

tools/sync/command.py

@@ -167,6 +167,12 @@ def getretcode(self):
         else:
             return self.returncode
 
+    def getoutputstr(self):
+        if self.state is Command.FINISHED:
+            return "".join(self.out).strip()
+        else:
+            return None
+
     def getoutput(self):
         if self.state is Command.FINISHED:
             return self.out

tools/sync/cvs.py

@@ -44,7 +44,7 @@ def reposync(self):
         hg_command = [self.command, "update", "-dP"]
         cmd = Command(hg_command, work_dir=self.path, env_vars=self.env)
         cmd.execute()
-        self.logger.info(cmd.getoutput())
+        self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             self.logger.error("failed to perform update for {}".
                               format(self.path))

tools/sync/git.py

@@ -43,7 +43,7 @@ def reposync(self):
         hg_command = [self.command, "pull", "--ff-only"]
         cmd = Command(hg_command, work_dir=self.path, env_vars=self.env)
         cmd.execute()
-        self.logger.info(cmd.getoutput())
+        self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             self.logger.error("failed to perform pull for {}".
                 format(self.path))

tools/sync/mercurial.py

@@ -68,7 +68,7 @@ def reposync(self):
             hg_command.append(branch)
         cmd = Command(hg_command, work_dir=self.path, env_vars=self.env)
         cmd.execute()
-        self.logger.info(cmd.getoutput())
+        self.logger.info(cmd.getoutputstr())
 	#
 	# 'hg incoming' will return 1 if there are no incoming changesets,
 	# so do not check the return value.
@@ -83,7 +83,7 @@ def reposync(self):
             hg_command.append(branch)
         cmd = Command(hg_command, work_dir=self.path, env_vars=self.env)
         cmd.execute()
-        self.logger.info(cmd.getoutput())
+        self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             self.logger.error("failed to perform pull")
             return 1
@@ -95,7 +95,7 @@ def reposync(self):
             hg_command.append("--check")
         cmd = Command(hg_command, work_dir=self.path, env_vars=self.env)
         cmd.execute()
-        self.logger.info(cmd.getoutput())
+        self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             self.logger.error("failed to perform pull and update")
             return 1

tools/sync/svn.py

@@ -44,7 +44,7 @@ def reposync(self):
         hg_command = [self.command, "update"]
         cmd = Command(hg_command, work_dir=self.path, env_vars=self.env)
         cmd.execute()
-        self.logger.info(cmd.getoutput())
+        self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             self.logger.error("failed to perform update for {}".
                               format(self.path))

tools/sync/teamware.py

@@ -43,7 +43,7 @@ def reposync(self):
         hg_command = ["bringover"]
         cmd = Command(hg_command, work_dir=self.path, env_vars=self.env)
         cmd.execute()
-        self.logger.info(cmd.getoutput())
+        self.logger.info(cmd.getoutputstr())
         if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
             self.logger.error("failed to perform bringover for {}".
                               format(self.path))