diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-28 15:01:08 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-28 13:54:31 -0800 |
commit | d4125bcac0b1ff225dbfd90d2a5722a2f4e64ff8 (patch) | |
tree | fc42e4f4518015a160edfa88f23ef699839171e2 /bitbake/lib/bb/server/none.py | |
parent | c0202071428fde6ef0a93de9c99d416624628813 (diff) | |
download | poky-d4125bcac0b1ff225dbfd90d2a5722a2f4e64ff8.tar.gz |
bitbake: Simplfy pre and post cooker hooks
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/server/none.py')
-rw-r--r-- | bitbake/lib/bb/server/none.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/bitbake/lib/bb/server/none.py b/bitbake/lib/bb/server/none.py index 38f713c519..dafb2feba9 100644 --- a/bitbake/lib/bb/server/none.py +++ b/bitbake/lib/bb/server/none.py | |||
@@ -109,11 +109,9 @@ class BitBakeServer(): | |||
109 | # remove this when you're done with debugging | 109 | # remove this when you're done with debugging |
110 | # allow_reuse_address = True | 110 | # allow_reuse_address = True |
111 | 111 | ||
112 | def __init__(self, cooker, pre_serve, post_serve): | 112 | def __init__(self, cooker): |
113 | self._idlefuns = {} | 113 | self._idlefuns = {} |
114 | self.commands = BitBakeServerCommands(self, cooker) | 114 | self.commands = BitBakeServerCommands(self, cooker) |
115 | self.pre_serve = pre_serve | ||
116 | self.post_serve = post_serve | ||
117 | 115 | ||
118 | def register_idle_function(self, function, data): | 116 | def register_idle_function(self, function, data): |
119 | """Register a function to be called while the server is idle""" | 117 | """Register a function to be called while the server is idle""" |
@@ -169,10 +167,7 @@ class BitBakeServerFork(): | |||
169 | 167 | ||
170 | class BitbakeUILauch(): | 168 | class BitbakeUILauch(): |
171 | def launch(self, serverinfo, uifunc, *args): | 169 | def launch(self, serverinfo, uifunc, *args): |
172 | serverinfo.server.pre_serve() | 170 | return bb.cooker.server_main(serverinfo.cooker, uifunc, *args) |
173 | ret = bb.cooker.server_main(serverinfo.cooker, uifunc, *args) | ||
174 | serverinfo.server.post_serve() | ||
175 | return ret | ||
176 | 171 | ||
177 | class BitBakeServerConnection(): | 172 | class BitBakeServerConnection(): |
178 | def __init__(self, serverinfo): | 173 | def __init__(self, serverinfo): |