fix errors introduced by refactoring

Author: Vladimir Kotal

tools/sync/commands.py

@@ -71,13 +71,18 @@ def __init__(self, base):
         logging.basicConfig()
 
     def run_command(self, command):
+        """
+        Execute a command and return its return code.
+        """
         cmd = Command(command,
                       args_subst={"PROJECT": self.name},
                       args_append=[self.name], excl_subst=True)
         cmd.execute()
         self.retcodes[str(cmd)] = cmd.getretcode()
         self.outputs[str(cmd)] = cmd.getoutput()
 
+        return cmd.getretcode()
+
     def call_rest_api(self, command):
         """
         Make RESTful API call.
@@ -118,18 +123,17 @@ def run(self):
             if is_web_uri(command[0]):
                 self.call_rest_api(command)
             else:
-                self.run_command(command)
+                retcode = self.run_command(command)
 
                 # If a command fails, terminate the sequence of commands.
-                retcode = cmd.getretcode()
                 if retcode != 0:
                     if retcode == 2:
                         self.logger.info("command '{}' requested break".
-                                         format(cmd))
+                                         format(command))
                         self.run_cleanup()
                     else:
                         self.logger.info("command '{}' failed with code {}, "
-                                         "breaking".format(cmd, retcode))
+                                         "breaking".format(command, retcode))
                         self.failed = True
                         self.run_cleanup()
                     break