From dacc94bcace85a2e95aee2dccd8e680c59e4545f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 13 Sep 2013 17:34:42 +0100 Subject: [PATCH] cooker: updateCache should rause exceptions, not sys.exit Exiting from the server is antisocial, instead we should raise an exception. This will correctly fail the current command and reset the server state. We use the handled exception since for these conditions to occur, something was already displayed to the user. Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 0a4dc7eb625..a07615b04c7 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1172,7 +1172,7 @@ class BBCooker: if self.state in (state.shutdown, state.forceshutdown): self.parser.shutdown(clean=False, force = True) - sys.exit(1) + raise bb.BBHandledException() if self.state != state.parsing: self.parseConfiguration () @@ -1194,7 +1194,7 @@ class BBCooker: if not self.parser.parse_next(): collectlog.debug(1, "parsing complete") if self.parser.error: - sys.exit(1) + raise bb.BBHandledException() self.show_appends_with_no_recipes() self.handlePrefProviders() self.recipecache.bbfile_priority = self.collection.collection_priorities(self.recipecache.pkg_fn) -- 2.47.3