ソースを参照

cooker/cookerdata: Use BBHandledException, not sys.exit()

Calling sys.exit() in the middle of the code is rather antisocial. We catch
this in various places but we shouldn't have to. In all these cases we have
already sent events explaining to the user what happened. This means the
correct exception is BBHandledException.

The recent startup changes have moved the point a lot of this code gets
called to inside the UI, with memres it would have always been possible
from there anyway. This change makes things much more consistent.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Richard Purdie 3 年 前
コミット
91699f366d
2 ファイル変更7 行追加7 行削除
  1. 2 2
      lib/bb/cooker.py
  2. 5 5
      lib/bb/cookerdata.py

+ 2 - 2
lib/bb/cooker.py

@@ -352,7 +352,7 @@ class BBCooker:
                 self.caches_array.append(getattr(module, cache_name))
                 self.caches_array.append(getattr(module, cache_name))
             except ImportError as exc:
             except ImportError as exc:
                 logger.critical("Unable to import extra RecipeInfo '%s' from '%s': %s" % (cache_name, module_name, exc))
                 logger.critical("Unable to import extra RecipeInfo '%s' from '%s': %s" % (cache_name, module_name, exc))
-                sys.exit("FATAL: Failed to import extra cache class '%s'." % cache_name)
+                raise bb.BBHandledException()
 
 
         self.databuilder = bb.cookerdata.CookerDataBuilder(self.configuration, False)
         self.databuilder = bb.cookerdata.CookerDataBuilder(self.configuration, False)
         self.databuilder.parseBaseConfiguration()
         self.databuilder.parseBaseConfiguration()
@@ -1127,7 +1127,7 @@ class BBCooker:
             from bb import shell
             from bb import shell
         except ImportError:
         except ImportError:
             parselog.exception("Interactive mode not available")
             parselog.exception("Interactive mode not available")
-            sys.exit(1)
+            raise bb.BBHandledException()
         else:
         else:
             shell.start( self )
             shell.start( self )
 
 

+ 5 - 5
lib/bb/cookerdata.py

@@ -164,7 +164,7 @@ def catch_parse_error(func):
             import traceback
             import traceback
             parselog.critical(traceback.format_exc())
             parselog.critical(traceback.format_exc())
             parselog.critical("Unable to parse %s: %s" % (fn, exc))
             parselog.critical("Unable to parse %s: %s" % (fn, exc))
-            sys.exit(1)
+            raise bb.BBHandledException()
         except bb.data_smart.ExpansionError as exc:
         except bb.data_smart.ExpansionError as exc:
             import traceback
             import traceback
 
 
@@ -176,10 +176,10 @@ def catch_parse_error(func):
                 if not fn.startswith(bbdir):
                 if not fn.startswith(bbdir):
                     break
                     break
             parselog.critical("Unable to parse %s" % fn, exc_info=(exc_class, exc, tb))
             parselog.critical("Unable to parse %s" % fn, exc_info=(exc_class, exc, tb))
-            sys.exit(1)
+            raise bb.BBHandledException()
         except bb.parse.ParseError as exc:
         except bb.parse.ParseError as exc:
             parselog.critical(str(exc))
             parselog.critical(str(exc))
-            sys.exit(1)
+            raise bb.BBHandledException()
     return wrapped
     return wrapped
 
 
 @catch_parse_error
 @catch_parse_error
@@ -355,7 +355,7 @@ class CookerDataBuilder(object):
                 for layer in broken_layers:
                 for layer in broken_layers:
                     parselog.critical("   %s", layer)
                     parselog.critical("   %s", layer)
                 parselog.critical("Please check BBLAYERS in %s" % (layerconf))
                 parselog.critical("Please check BBLAYERS in %s" % (layerconf))
-                sys.exit(1)
+                raise bb.BBHandledException()
 
 
             for layer in layers:
             for layer in layers:
                 parselog.debug(2, "Adding layer %s", layer)
                 parselog.debug(2, "Adding layer %s", layer)
@@ -427,7 +427,7 @@ class CookerDataBuilder(object):
             handlerfn = data.getVarFlag(var, "filename", False)
             handlerfn = data.getVarFlag(var, "filename", False)
             if not handlerfn:
             if not handlerfn:
                 parselog.critical("Undefined event handler function '%s'" % var)
                 parselog.critical("Undefined event handler function '%s'" % var)
-                sys.exit(1)
+                raise bb.BBHandledException()
             handlerln = int(data.getVarFlag(var, "lineno", False))
             handlerln = int(data.getVarFlag(var, "lineno", False))
             bb.event.register(var, data.getVar(var, False),  (data.getVarFlag(var, "eventmask") or "").split(), handlerfn, handlerln)
             bb.event.register(var, data.getVar(var, False),  (data.getVarFlag(var, "eventmask") or "").split(), handlerfn, handlerln)