summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-07 13:54:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-07 13:54:50 +0000
commit0e26f53f9e2f190b302235864552956ed8f6d39b (patch)
tree9e6e75ad30f88cd288ef0b31f1a2dae0a4626e43 /bitbake/lib/bb
parent847b717862a518746bc5e457f40760e3bd36f1db (diff)
downloadpoky-0e26f53f9e2f190b302235864552956ed8f6d39b.tar.gz
bitbake/cooker.py: Fix merge conflict with upstream which was preventing clean bitbake shutdown
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/cooker.py11
1 files changed, 5 insertions, 6 deletions
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:
893 def post_serve(self): 893 def post_serve(self):
894 bb.event.fire(CookerExit(), self.configuration.event_data) 894 bb.event.fire(CookerExit(), self.configuration.event_data)
895 895
896 def shutdown(self):
897 self.state = state.shutdown
898
899 def stop(self):
900 self.state = state.stop
896 901
897def server_main(cooker, func, *args): 902def server_main(cooker, func, *args):
898 cooker.pre_serve() 903 cooker.pre_serve()
@@ -935,12 +940,6 @@ def server_main(cooker, func, *args):
935 940
936 return ret 941 return ret
937 942
938 def shutdown(self):
939 self.state = state.shutdown
940
941 def stop(self):
942 self.state = state.stop
943
944class CookerExit(bb.event.Event): 943class CookerExit(bb.event.Event):
945 """ 944 """
946 Notify clients of the Cooker shutdown 945 Notify clients of the Cooker shutdown