summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-09 17:01:51 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-10 17:40:43 (GMT)
commita5463088fe57462bf681b648d21212808454fc2a (patch)
treee3412641a6d15ef93b55f06e14ff51c45fef402e
parente4a365098a9550facae9af069d4b58770dabfd91 (diff)
downloadpoky-a5463088fe57462bf681b648d21212808454fc2a.tar.gz
bitbake: Add BBHandledException exception class
We have a problem knowing when to show the user debug information and when not to since the code has already shown the user suitable information about why a failure is occurring. This patch adds a bb.BBHandledException exception class which can be used to identify those exceptions which don't need further explanation to the user. This patch uses this class for the bb.providers exceptions and ensures the command handling code correctly filters the exceptions meaning that "bitbake invalid" now shows an simple error message and not a python traceback. [YOCTO #1141 partial] (Bitbake rev: eac9249b40ae1e3aa21e016010c862664e59a8d4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/__init__.py12
-rw-r--r--bitbake/lib/bb/command.py7
-rw-r--r--bitbake/lib/bb/providers.py4
3 files changed, 19 insertions, 4 deletions
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index 5dc959c..81f83c8 100644
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/lib/bb/__init__.py
@@ -27,6 +27,18 @@ import sys
27if sys.version_info < (2, 6, 0): 27if sys.version_info < (2, 6, 0):
28 raise RuntimeError("Sorry, python 2.6.0 or later is required for this version of bitbake") 28 raise RuntimeError("Sorry, python 2.6.0 or later is required for this version of bitbake")
29 29
30
31class BBHandledException(Exception):
32 """
33 The big dilemma for generic bitbake code is what information to give the user
34 when an exception occurs. Any exception inheriting this base exception class
35 has already provided information to the user via some 'fired' message type such as
36 an explicitly fired event using bb.fire, or a bb.error message. If bitbake
37 encounters an exception derived from this class, no backtrace or other information
38 will be given to the user, its assumed the earlier event provided the relevant information.
39 """
40 pass
41
30import os 42import os
31import logging 43import logging
32 44
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index f236dac..2a3a3af 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -98,9 +98,12 @@ class Command:
98 else: 98 else:
99 self.finishAsyncCommand("Exited with %s" % arg) 99 self.finishAsyncCommand("Exited with %s" % arg)
100 return False 100 return False
101 except Exception: 101 except Exception as exc:
102 import traceback 102 import traceback
103 self.finishAsyncCommand(traceback.format_exc()) 103 if isinstance(exc, bb.BBHandledException):
104 self.finishAsyncCommand("")
105 else:
106 self.finishAsyncCommand(traceback.format_exc())
104 return False 107 return False
105 108
106 def finishAsyncCommand(self, msg=None, code=None): 109 def finishAsyncCommand(self, msg=None, code=None):
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index 4543447..398c8ea 100644
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -28,10 +28,10 @@ import bb
28 28
29logger = logging.getLogger("BitBake.Provider") 29logger = logging.getLogger("BitBake.Provider")
30 30
31class NoProvider(Exception): 31class NoProvider(bb.BBHandledException):
32 """Exception raised when no provider of a build dependency can be found""" 32 """Exception raised when no provider of a build dependency can be found"""
33 33
34class NoRProvider(Exception): 34class NoRProvider(bb.BBHandledException):
35 """Exception raised when no provider of a runtime dependency can be found""" 35 """Exception raised when no provider of a runtime dependency can be found"""
36 36
37 37