summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-09 17:01:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-10 17:40:43 +0000
commita5463088fe57462bf681b648d21212808454fc2a (patch)
treee3412641a6d15ef93b55f06e14ff51c45fef402e
parente4a365098a9550facae9af069d4b58770dabfd91 (diff)
downloadpoky-a5463088fe57462bf681b648d21212808454fc2a.tar.gz
poky-a5463088fe57462bf681b648d21212808454fc2a.tar.bz2
poky-a5463088fe57462bf681b648d21212808454fc2a.zip
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 5dc959c7e5..81f83c88d5 100644
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/lib/bb/__init__.py
@@ -27,6 +27,18 @@ import sys
if sys.version_info < (2, 6, 0):
raise RuntimeError("Sorry, python 2.6.0 or later is required for this version of bitbake")
+
+class BBHandledException(Exception):
+ """
+ The big dilemma for generic bitbake code is what information to give the user
+ when an exception occurs. Any exception inheriting this base exception class
+ has already provided information to the user via some 'fired' message type such as
+ an explicitly fired event using bb.fire, or a bb.error message. If bitbake
+ encounters an exception derived from this class, no backtrace or other information
+ will be given to the user, its assumed the earlier event provided the relevant information.
+ """
+ pass
+
import os
import logging
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index f236daceb1..2a3a3afaca 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -98,9 +98,12 @@ class Command:
else:
self.finishAsyncCommand("Exited with %s" % arg)
return False
- except Exception:
+ except Exception as exc:
import traceback
- self.finishAsyncCommand(traceback.format_exc())
+ if isinstance(exc, bb.BBHandledException):
+ self.finishAsyncCommand("")
+ else:
+ self.finishAsyncCommand(traceback.format_exc())
return False
def finishAsyncCommand(self, msg=None, code=None):
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index 4543447057..398c8ea115 100644
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -28,10 +28,10 @@ import bb
logger = logging.getLogger("BitBake.Provider")
-class NoProvider(Exception):
+class NoProvider(bb.BBHandledException):
"""Exception raised when no provider of a build dependency can be found"""
-class NoRProvider(Exception):
+class NoRProvider(bb.BBHandledException):
"""Exception raised when no provider of a runtime dependency can be found"""