mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: prserv: use only PRSERV_HOST

Browse Source 
- remove PRSERV_PORT variable
- use 'hostname:port' as PRSERV_HOST format
- use 'localhost:0' for enabling the local PRServer

[YOCTO #3744]

(Bitbake rev: ad62eed9e1f0867a406e9fbfa44916a0f1ad1282)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Constantin Musca
2013-01-23 16:54:03 +02:00
committed by Richard Purdie
parent 6930251f6c
commit 1db3531cd5
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bitbake/lib/prserv/serv.py
View File

@@ -268,10 +268,17 @@ def is_local_special(host, port):
def auto_start(d): def auto_start(d):
global singleton global singleton
if (not d.getVar('PRSERV_HOST', True)) or (not d.getVar('PRSERV_PORT', True)):
host_params = filter(None, (d.getVar('PRSERV_HOST', True) or '').split(':'))
if not host_params:
return True return True
if is_local_special(d.getVar('PRSERV_HOST', True), int(d.getVar('PRSERV_PORT', True))) and not singleton: if len(host_params) != 2:
logger.critical('\n'.join(['PRSERV_HOST: incorrect format',
'Usage: PRSERV_HOST = "<hostname>:<port>"']))
return True
if is_local_special(host_params[0], int(host_params[1])) and not singleton:
import bb.utils import bb.utils
cachedir = (d.getVar("PERSISTENT_DIR", True) or d.getVar("CACHE", True)) cachedir = (d.getVar("PERSISTENT_DIR", True) or d.getVar("CACHE", True))
if not cachedir: if not cachedir:
@@ -285,8 +292,8 @@ def auto_start(d):
if singleton: if singleton:
host, port = singleton.getinfo() host, port = singleton.getinfo()
else: else:
host = d.getVar('PRSERV_HOST', True) host = host_params[0]
port = int(d.getVar('PRSERV_PORT', True)) port = int(host_params[1])
try: try:
return PRServerConnection(host,port).ping() return PRServerConnection(host,port).ping()