diff options
Diffstat (limited to 'bitbake/lib/bb/server/xmlrpc.py')
| -rw-r--r-- | bitbake/lib/bb/server/xmlrpc.py | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py index 5dcaa6c7b0..6fc5543a80 100644 --- a/bitbake/lib/bb/server/xmlrpc.py +++ b/bitbake/lib/bb/server/xmlrpc.py | |||
| @@ -340,9 +340,6 @@ class BitBakeXMLRPCClient(BitBakeBaseServer): | |||
| 340 | def saveConnectionDetails(self, remote): | 340 | def saveConnectionDetails(self, remote): |
| 341 | self.remote = remote | 341 | self.remote = remote |
| 342 | 342 | ||
| 343 | def saveConnectionConfigParams(self, configParams): | ||
| 344 | self.configParams = configParams | ||
| 345 | |||
| 346 | def establishConnection(self, featureset): | 343 | def establishConnection(self, featureset): |
| 347 | # The format of "remote" must be "server:port" | 344 | # The format of "remote" must be "server:port" |
| 348 | try: | 345 | try: |
| @@ -351,27 +348,6 @@ class BitBakeXMLRPCClient(BitBakeBaseServer): | |||
| 351 | except Exception as e: | 348 | except Exception as e: |
| 352 | bb.fatal("Failed to read remote definition (%s)" % str(e)) | 349 | bb.fatal("Failed to read remote definition (%s)" % str(e)) |
| 353 | 350 | ||
| 354 | # use automatic port if port set to -1, meaning read it from | ||
| 355 | # the bitbake.lock file | ||
| 356 | if port == -1: | ||
| 357 | lock_location = "%s/bitbake.lock" % self.configParams.environment.get('BUILDDIR') | ||
| 358 | lock = bb.utils.lockfile(lock_location, False, False) | ||
| 359 | if lock: | ||
| 360 | # This means there is no server running which we can | ||
| 361 | # connect to on the local system. | ||
| 362 | bb.utils.unlockfile(lock) | ||
| 363 | return None | ||
| 364 | |||
| 365 | try: | ||
| 366 | lf = open(lock_location, 'r') | ||
| 367 | remotedef = lf.readline() | ||
| 368 | [host, port] = remotedef.split(":") | ||
| 369 | port = int(port) | ||
| 370 | lf.close() | ||
| 371 | self.remote = remotedef | ||
| 372 | except Exception as e: | ||
| 373 | bb.fatal("Failed to read bitbake.lock (%s)" % str(e)) | ||
| 374 | |||
| 375 | # We need our IP for the server connection. We get the IP | 351 | # We need our IP for the server connection. We get the IP |
| 376 | # by trying to connect with the server | 352 | # by trying to connect with the server |
| 377 | try: | 353 | try: |
