check status first

oracle · Jan 2, 2025 · 721c9aa · 721c9aa
1 parent aedd648
commit 721c9aa
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tools/src/main/python/opengrok_tools/scm/mercurial.py b/tools/src/main/python/opengrok_tools/scm/mercurial.py
@@ -45,7 +45,7 @@ def get_branch(self):
         cmd.execute()
         self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
-        if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
+        if cmd.getstate() != Command.FINISHED or cmd.getretcode() != 0:
             cmd.log_error("failed to get branch")
             return None
         else:
@@ -73,7 +73,7 @@ def reposync(self):
         cmd.execute()
         self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
-        if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
+        if cmd.getstate() != Command.FINISHED or cmd.getretcode() != 0:
             cmd.log_error("failed to perform pull")
             return 1
 
@@ -98,7 +98,7 @@ def reposync(self):
         cmd.execute()
         self.logger.info("output of {}:".format(cmd))
         self.logger.info(cmd.getoutputstr())
-        if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED:
+        if cmd.getstate() != Command.FINISHED or cmd.getretcode() != 0:
             cmd.log_error("failed to perform pull and update")
             return 1