diff options
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-x | bitbake/bin/bitbake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index c87e5b3984..ac35b94e3b 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake | |||
@@ -193,8 +193,8 @@ def main(): | |||
193 | 193 | ||
194 | # Server type can be xmlrpc, process or none currently, if nothing is specified, | 194 | # Server type can be xmlrpc, process or none currently, if nothing is specified, |
195 | # the default server is process | 195 | # the default server is process |
196 | if configuration.servertype: | 196 | if configParams.servertype: |
197 | server_type = configuration.servertype | 197 | server_type = configParams.servertype |
198 | else: | 198 | else: |
199 | server_type = 'process' | 199 | server_type = 'process' |
200 | 200 | ||
@@ -205,13 +205,13 @@ def main(): | |||
205 | sys.exit("FATAL: Invalid server type '%s' specified.\n" | 205 | sys.exit("FATAL: Invalid server type '%s' specified.\n" |
206 | "Valid interfaces: xmlrpc, process [default], none." % servertype) | 206 | "Valid interfaces: xmlrpc, process [default], none." % servertype) |
207 | 207 | ||
208 | if configuration.server_only: | 208 | if configParams.server_only: |
209 | if configuration.servertype != "xmlrpc": | 209 | if configParams.servertype != "xmlrpc": |
210 | sys.exit("FATAL: If '--server-only' is defined, we must set the servertype as 'xmlrpc'.\n") | 210 | sys.exit("FATAL: If '--server-only' is defined, we must set the servertype as 'xmlrpc'.\n") |
211 | if not configuration.bind: | 211 | if not configParams.bind: |
212 | sys.exit("FATAL: The '--server-only' option requires a name/address to bind to with the -B option.\n") | 212 | sys.exit("FATAL: The '--server-only' option requires a name/address to bind to with the -B option.\n") |
213 | 213 | ||
214 | if configuration.bind and configuration.servertype != "xmlrpc": | 214 | if configParams.bind and configParams.servertype != "xmlrpc": |
215 | sys.exit("FATAL: If '-B' or '--bind' is defined, we must set the servertype as 'xmlrpc'.\n") | 215 | sys.exit("FATAL: If '-B' or '--bind' is defined, we must set the servertype as 'xmlrpc'.\n") |
216 | 216 | ||
217 | if "BBDEBUG" in os.environ: | 217 | if "BBDEBUG" in os.environ: |
@@ -219,7 +219,7 @@ def main(): | |||
219 | if level > configuration.debug: | 219 | if level > configuration.debug: |
220 | configuration.debug = level | 220 | configuration.debug = level |
221 | 221 | ||
222 | bb.msg.init_msgconfig(configuration.verbose, configuration.debug, | 222 | bb.msg.init_msgconfig(configParams.verbose, configuration.debug, |
223 | configuration.debug_domains) | 223 | configuration.debug_domains) |
224 | 224 | ||
225 | # Ensure logging messages get sent to the UI as events | 225 | # Ensure logging messages get sent to the UI as events |
@@ -230,8 +230,8 @@ def main(): | |||
230 | cleanedvars = bb.utils.clean_environment() | 230 | cleanedvars = bb.utils.clean_environment() |
231 | 231 | ||
232 | server = server.BitBakeServer() | 232 | server = server.BitBakeServer() |
233 | if configuration.bind: | 233 | if configParams.bind: |
234 | server.initServer((configuration.bind, 0)) | 234 | server.initServer((configParams.bind, 0)) |
235 | else: | 235 | else: |
236 | server.initServer() | 236 | server.initServer() |
237 | 237 | ||
@@ -262,7 +262,7 @@ def main(): | |||
262 | 262 | ||
263 | logger.removeHandler(handler) | 263 | logger.removeHandler(handler) |
264 | 264 | ||
265 | if not configuration.server_only: | 265 | if not configParams.server_only: |
266 | # Setup a connection to the server (cooker) | 266 | # Setup a connection to the server (cooker) |
267 | server_connection = server.establishConnection() | 267 | server_connection = server.establishConnection() |
268 | 268 | ||