diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-03 08:27:12 -1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-05 12:36:37 +0000 |
| commit | f18b65d0b9a6b983d53bde491e1bf2ca56949444 (patch) | |
| tree | 81d3534e9e690b360e9627eafb16ba6153652c23 | |
| parent | a6ad6eaf4cddbe45077d1e6cb667f71602b8a49d (diff) | |
| download | bitbake-contrib-f18b65d0b9a6b983d53bde491e1bf2ca56949444.tar.gz | |
bblayers/action: When adding layers, catch BBHandledException
When adding a layer, parse error can occur, raising BBHandledException.
Catch this and error, aborting the layer add to meet user expectations.
[YOCTO #14054]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ceddb5b3d229b83c172656053cd29aeb521fcce0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bblayers/action.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bblayers/action.py b/lib/bblayers/action.py index d6459d661..d2f9c1bbd 100644 --- a/lib/bblayers/action.py +++ b/lib/bblayers/action.py @@ -50,10 +50,10 @@ class ActionPlugin(LayerPlugin): if not (args.force or notadded): try: self.tinfoil.run_command('parseConfiguration') - except bb.tinfoil.TinfoilUIException: + except (bb.tinfoil.TinfoilUIException, bb.BBHandledException): # Restore the back up copy of bblayers.conf shutil.copy2(backup, bblayers_conf) - bb.fatal("Parse failure with the specified layer added") + bb.fatal("Parse failure with the specified layer added, aborting.") else: for item in notadded: sys.stderr.write("Specified layer %s is already in BBLAYERS\n" % item) |