Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 15:53:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: build_binaries.py: avoid exception while handling exception

Browse Source 
From the build server:

  File "./build_binaries.py", line 570, in get_exception_stacktrace
    ret = "%s\n" % e
  File "/usr/lib/python3.8/subprocess.py", line 113, in __str__
    if self.returncode and self.returncode < 0:
This commit is contained in:
Peter Barker 2023-05-23 23:33:21 +10:00 committed by Andrew Tridgell
parent 59b24c304f
commit 1359b43742
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/scripts/build_binaries.py
View File

@ -565,7 +565,7 @@ is bob we will attempt to checkout bob-AVR'''
self.checkout(vehicle, "latest") self.checkout(vehicle, "latest")
def get_exception_stacktrace(self, e): def _get_exception_stacktrace(self, e):
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
ret = "%s\n" % e ret = "%s\n" % e
ret += ''.join(traceback.format_exception(type(e), ret += ''.join(traceback.format_exception(type(e),
@ -576,6 +576,12 @@ is bob we will attempt to checkout bob-AVR'''
# Python2: # Python2:
return traceback.format_exc(e) return traceback.format_exc(e)
def get_exception_stacktrace(self, e):
try:
return self._get_exception_stacktrace(e)
except Exception:
return "FAILED TO GET EXCEPTION STACKTRACE"
def print_exception_caught(self, e, send_statustext=True): def print_exception_caught(self, e, send_statustext=True):
self.progress("Exception caught: %s" % self.progress("Exception caught: %s" %
self.get_exception_stacktrace(e)) self.get_exception_stacktrace(e))