-
Notifications
You must be signed in to change notification settings - Fork 758
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ | |
| # | ||
|
|
||
| # | ||
| # Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. | ||
| # Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. | ||
| # Portions Copyright (c) 2020, Krystof Tulinger <[email protected]> | ||
| # | ||
|
|
||
|
|
@@ -44,7 +44,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: | ||
| self.logger.error("failed to perform update: command {}" | ||
| "in directory {} exited with {}". | ||
| format(hg_command, self.path, cmd.getretcode())) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ | |
| # | ||
|
|
||
| # | ||
| # Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. | ||
| # Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. | ||
| # Portions Copyright (c) 2020, Krystof Tulinger <[email protected]> | ||
| # | ||
|
|
||
|
|
@@ -44,7 +44,7 @@ def _configure_git_pull(self): | |
| cmd = self.get_command(git_command, work_dir=self.path, | ||
| env_vars=self.env, logger=self.logger) | ||
| cmd.execute() | ||
| if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED: | ||
| if cmd.getstate() != Command.FINISHED or cmd.getretcode() != 0: | ||
| cmd.log_error("failed to configure git pull.ff") | ||
|
|
||
| def reposync(self): | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ | |
| # | ||
|
|
||
| # | ||
| # Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. | ||
| # Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. | ||
| # Portions Copyright (c) 2020, Krystof Tulinger <[email protected]> | ||
| # | ||
|
|
||
|
|
@@ -161,7 +161,7 @@ def _run_command(self, command): | |
| cmd = self.get_command(command, work_dir=self.path, | ||
| env_vars=self.env, logger=self.logger) | ||
| cmd.execute() | ||
| if cmd.getretcode() != 0 or cmd.getstate() != Command.FINISHED: | ||
| if cmd.getstate() != Command.FINISHED or cmd.getretcode() != 0: | ||
| cmd.log_error("failed to perform command {}".format(command)) | ||
| status = cmd.getretcode() | ||
| if status == 0 and cmd.getstate() != Command.FINISHED: | ||
|
|
||