diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-09-09 18:03:40 -0700 | 
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:35 +0000 | 
| commit | 9897d56861a3894e34bf77a62255dc57e680a18e (patch) | |
| tree | c9ac420fedf434e693d364d70380fe1b9475bd86 /bitbake/lib/bb/shell.py | |
| parent | 1e7204a7b5b7b9a73759646fa0e297c7b4bc55ed (diff) | |
| download | poky-9897d56861a3894e34bf77a62255dc57e680a18e.tar.gz | |
Simplify build exception handling
- Drop EventException
- Use FuncFailed as the primary function failure exception, using TaskFailed
  for the event (leaving it up to the process running exec_{func,task} to
  display the more detailed information available in the exception).
- Switch InvalidTask to an exception rather than an event, as that's a
  critical issue.
- Reduce the number of messages shown to the user when a task fails -- they
  don't need to be told it fails 12 times.  Work remains in this area though.
(Bitbake rev: 06b742aae2b8013cbb269cc30554cff89e3a5667)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/shell.py')
| -rw-r--r-- | bitbake/lib/bb/shell.py | 6 | 
1 files changed, 2 insertions, 4 deletions
diff --git a/bitbake/lib/bb/shell.py b/bitbake/lib/bb/shell.py index f9ca9d5bd3..c61e93a1cb 100644 --- a/bitbake/lib/bb/shell.py +++ b/bitbake/lib/bb/shell.py  | |||
| @@ -180,11 +180,9 @@ class BitBakeShellCommands: | |||
| 180 | last_exception = Providers.NoProvider | 180 | last_exception = Providers.NoProvider | 
| 181 | 181 | ||
| 182 | except runqueue.TaskFailure as fnids: | 182 | except runqueue.TaskFailure as fnids: | 
| 183 | for fnid in fnids: | ||
| 184 | print("ERROR: '%s' failed" % td.fn_index[fnid]) | ||
| 185 | last_exception = runqueue.TaskFailure | 183 | last_exception = runqueue.TaskFailure | 
| 186 | 184 | ||
| 187 | except build.EventException as e: | 185 | except build.FuncFailed as e: | 
| 188 | print("ERROR: Couldn't build '%s'" % names) | 186 | print("ERROR: Couldn't build '%s'" % names) | 
| 189 | last_exception = e | 187 | last_exception = e | 
| 190 | 188 | ||
| @@ -247,7 +245,7 @@ class BitBakeShellCommands: | |||
| 247 | cooker.buildFile(bf, cmd) | 245 | cooker.buildFile(bf, cmd) | 
| 248 | except parse.ParseError: | 246 | except parse.ParseError: | 
| 249 | print("ERROR: Unable to open or parse '%s'" % bf) | 247 | print("ERROR: Unable to open or parse '%s'" % bf) | 
| 250 | except build.EventException as e: | 248 | except build.FuncFailed as e: | 
| 251 | print("ERROR: Couldn't build '%s'" % name) | 249 | print("ERROR: Couldn't build '%s'" % name) | 
| 252 | last_exception = e | 250 | last_exception = e | 
| 253 | 251 | ||
