summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 14:23:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:15:12 +0100
commite6d9af19d6ef94522e5c53eb84c490e7b5473c69 (patch)
tree3fa0c97270cd762551087cfd3731ca91475f5fda /bitbake
parent0b14db452413df414fbadf14d6dae287bc5ae9ca (diff)
downloadpoky-e6d9af19d6ef94522e5c53eb84c490e7b5473c69.tar.gz
bitbake/exceptions: Handle reports from the field of exception code failures
Despite using python 2.6, there have been reports of issues where bitbake is printing tracebacks with errors in the exception handling code. This was masking the real error. Since we need to do whatever we can to give the user good feedback about errors, detect the tuple instead of namedtuple case and don't fault in the exception handler but just give up trying to traceback any further. In the reported cases, this gives a message the user can then understand. (Bitbake rev: 9ec0429271e68527a55fc123dea5a1b959c6ec3b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/exceptions.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/bitbake/lib/bb/exceptions.py b/bitbake/lib/bb/exceptions.py
index 4dd3e2cc31..f182c8fd62 100644
--- a/bitbake/lib/bb/exceptions.py
+++ b/bitbake/lib/bb/exceptions.py
@@ -32,7 +32,14 @@ class TracebackEntry(namedtuple.abc):
32def _get_frame_args(frame): 32def _get_frame_args(frame):
33 """Get the formatted arguments and class (if available) for a frame""" 33 """Get the formatted arguments and class (if available) for a frame"""
34 arginfo = inspect.getargvalues(frame) 34 arginfo = inspect.getargvalues(frame)
35 if not arginfo.args: 35
36 try:
37 if not arginfo.args:
38 return '', None
39 # There have been reports from the field of python 2.6 which doesn't
40 # return a namedtuple here but simply a tuple so fallback gracefully if
41 # args isn't present.
42 except AttributeError:
36 return '', None 43 return '', None
37 44
38 firstarg = arginfo.args[0] 45 firstarg = arginfo.args[0]