mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-04 13:39:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake/cooker.py: Fix merge conflict with upstream which was preventing clean bitbake shutdown

Browse Source 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-01-07 13:54:50 +00:00
parent 847b717862
commit 0e26f53f9e
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bitbake/lib/bb/cooker.py
View File

@@ -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