diff options
author | Randy Witt <randy.e.witt@linux.intel.com> | 2015-08-20 14:00:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-20 22:04:43 +0100 |
commit | a3d228a484cf471e999b6537987e2897d8a7bd4e (patch) | |
tree | a1cd82e5c7cec6d2249721126d208528ad92f932 /bitbake/lib | |
parent | a01a33b17861c227c1c16fbc2d819d86fb9bf893 (diff) | |
download | poky-a3d228a484cf471e999b6537987e2897d8a7bd4e.tar.gz |
bitbake: main: Handle RuntimeError exception in list_extension_modules
This exception was triggered in toaster from recent changes and is completely
breaking the whole of bitbake. Add the exception to the list so at least only
toaster is affected.
(Bitbake rev: f64def7cb6069dc1134fcd546bb59e4030c7376f)
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rwxr-xr-x | bitbake/lib/bb/main.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py index c98cf444b0..910cd64444 100755 --- a/bitbake/lib/bb/main.py +++ b/bitbake/lib/bb/main.py | |||
@@ -60,7 +60,7 @@ def list_extension_modules(pkg, checkattr): | |||
60 | continue | 60 | continue |
61 | try: | 61 | try: |
62 | module = __import__(pkg.__name__, fromlist=[modulename]) | 62 | module = __import__(pkg.__name__, fromlist=[modulename]) |
63 | except (ImportError, SystemExit): | 63 | except (ImportError, SystemExit, RuntimeError): |
64 | # If we can't import it, it's not valid | 64 | # If we can't import it, it's not valid |
65 | continue | 65 | continue |
66 | module_if = getattr(module, modulename) | 66 | module_if = getattr(module, modulename) |