summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/bitbake20
-rw-r--r--bitbake/lib/bb/cookerdata.py13
2 files changed, 21 insertions, 12 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
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 0b436b37e6..70e22b4a56 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -117,11 +117,20 @@ class CookerConfiguration(object):
117 self.postfile = [] 117 self.postfile = []
118 self.debug = 0 118 self.debug = 0
119 self.cmd = None 119 self.cmd = None
120 self.abort = True
121 self.force = False
122 self.ui = None
123 self.profile = False
124 self.nosetscene = False
125 self.invalidate_stamp = False
126 self.dump_signatures = False
127 self.dry_run = False
120 128
121 def setConfigParameters(self, parameters): 129 def setConfigParameters(self, parameters):
122 self.params = parameters 130 self.params = parameters
123 for key, val in parameters.options.__dict__.items(): 131 for key in self.__dict__.keys():
124 setattr(self, key, val) 132 if key in parameters.options.__dict__:
133 setattr(self, key, parameters.options.__dict__[key])
125 134
126 def setServerRegIdleCallback(self, srcb): 135 def setServerRegIdleCallback(self, srcb):
127 self.server_register_idlecallback = srcb 136 self.server_register_idlecallback = srcb