bitbake/cooker.py: Fix merge conflict with upstream which was preventing clean bitbake shutdown
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
847b717862
commit
0e26f53f9e
|
@ -893,6 +893,11 @@ class BBCooker:
|
||||||
def post_serve(self):
|
def post_serve(self):
|
||||||
bb.event.fire(CookerExit(), self.configuration.event_data)
|
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):
|
def server_main(cooker, func, *args):
|
||||||
cooker.pre_serve()
|
cooker.pre_serve()
|
||||||
|
@ -935,12 +940,6 @@ def server_main(cooker, func, *args):
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
def shutdown(self):
|
|
||||||
self.state = state.shutdown
|
|
||||||
|
|
||||||
def stop(self):
|
|
||||||
self.state = state.stop
|
|
||||||
|
|
||||||
class CookerExit(bb.event.Event):
|
class CookerExit(bb.event.Event):
|
||||||
"""
|
"""
|
||||||
Notify clients of the Cooker shutdown
|
Notify clients of the Cooker shutdown
|
||||||
|
|
Loading…
Reference in New Issue