diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-07 13:54:50 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-07 13:54:50 +0000 |
| commit | 0e26f53f9e2f190b302235864552956ed8f6d39b (patch) | |
| tree | 9e6e75ad30f88cd288ef0b31f1a2dae0a4626e43 /bitbake/lib | |
| parent | 847b717862a518746bc5e457f40760e3bd36f1db (diff) | |
| download | openembedded-core-0e26f53f9e2f190b302235864552956ed8f6d39b.tar.gz openembedded-core-0e26f53f9e2f190b302235864552956ed8f6d39b.tar.bz2 openembedded-core-0e26f53f9e2f190b302235864552956ed8f6d39b.zip | |
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')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 11 |
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: 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 |