From 0e26f53f9e2f190b302235864552956ed8f6d39b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Jan 2011 13:54:50 +0000 Subject: bitbake/cooker.py: Fix merge conflict with upstream which was preventing clean bitbake shutdown Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 23fd72f432..e524db7498 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -893,6 +893,11 @@ class BBCooker: def post_serve(self): bb.event.fire(CookerExit(), self.configuration.event_data) + def shutdown(self): + self.state = state.shutdown + + def stop(self): + self.state = state.stop def server_main(cooker, func, *args): cooker.pre_serve() @@ -935,12 +940,6 @@ def server_main(cooker, func, *args): return ret - def shutdown(self): - self.state = state.shutdown - - def stop(self): - self.state = state.stop - class CookerExit(bb.event.Event): """ Notify clients of the Cooker shutdown -- cgit v1.2.3-54-g00ecf