Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Zhentan exitcode #1052

Merged
merged 10 commits into from
Sep 30, 2020
Merged

Zhentan exitcode #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b432e97
Remove raise exception to allow wait() to run that include exit code …
zhenghao104 Sep 9, 2020
6299ad1
Exit the system with correct exit code
zhenghao104 Sep 9, 2020
60393a5
Fix external_tool indentation
zhenghao104 Sep 9, 2020
4b1e9f8
Style fixing
zhenghao104 Sep 9, 2020
3fc05f9
remove import to fix style issues
zhenghao104 Sep 9, 2020
fef8833
Fix pylint version at 2.5 to avoid merge issues on style check
zhenghao104 Sep 10, 2020
ca88479
Updated files to pass style check
zhenghao104 Sep 10, 2020
77c86a1
Fix changes to use cli original exit code instead of setting it manully
zhenghao104 Sep 18, 2020
78d2f28
Merge branch 'master' into zhentan-exitcode
zhenghao104 Sep 18, 2020
eb1ae43
Update external_tool.py
zhenghao104 Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-devops/azext_devops/dev/common/artifacttool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def _log_message(json_line):
ex = json_line['@x'] if '@x' in json_line else None
if ex:
message = "{}\n{}".format(message, ex)
logger.error(message)
logger.error(message)
if log_level == "Warning":
logger.warning(message)
elif log_level == "Information":
Expand Down
13 changes: 4 additions & 9 deletions azure-devops/azext_devops/dev/common/external_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import signal
import subprocess
import sys
import traceback

import humanfriendly
from knack.log import get_logger
Expand Down Expand Up @@ -49,14 +48,10 @@ def wait(self):
stderr = self._proc.stderr.read().decode('utf-8', 'ignore').strip()
if stderr != "":
stderr = "\n{}".format(stderr)
try:
raise CLIError(
"Process {proc} with PID {pid} exited with return code {code}{err}"
.format(proc=self._args, pid=self._proc.pid, code=self._proc.returncode, err=stderr)
)
except CLIError:
traceback.print_exc()
sys.exit(self._proc.returncode)
raise CLIError(
"Process {proc} with PID {pid} exited with return code {code}{err}"
.format(proc=self._args, pid=self._proc.pid, code=self._proc.returncode, err=stderr)
)
return self._proc

def _sigint_handler(self):
Expand Down