|
@@ -288,11 +288,14 @@ def main():
|
|
|
scriptutils.logger_setup_color(logger, global_args.color)
|
|
|
|
|
|
if global_args.bbpath is None:
|
|
|
- tinfoil = setup_tinfoil(config_only=True, basepath=basepath)
|
|
|
try:
|
|
|
- global_args.bbpath = tinfoil.config_data.getVar('BBPATH', True)
|
|
|
- finally:
|
|
|
- tinfoil.shutdown()
|
|
|
+ tinfoil = setup_tinfoil(config_only=True, basepath=basepath)
|
|
|
+ try:
|
|
|
+ global_args.bbpath = tinfoil.config_data.getVar('BBPATH', True)
|
|
|
+ finally:
|
|
|
+ tinfoil.shutdown()
|
|
|
+ except bb.BBHandledException:
|
|
|
+ return 2
|
|
|
|
|
|
# Search BBPATH first to allow layers to override plugins in scripts_path
|
|
|
for path in global_args.bbpath.split(':') + [scripts_path]:
|