From 1db3531cd5ecded0ccf6a6fdc03b8ff4755c0c73 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Wed, 23 Jan 2013 16:54:03 +0200 Subject: bitbake: prserv: use only PRSERV_HOST - 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 Signed-off-by: Richard Purdie --- bitbake/lib/prserv/serv.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index 5567c6f574..d8bdf31ba9 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py @@ -268,10 +268,17 @@ def is_local_special(host, port): def auto_start(d): 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 + + if len(host_params) != 2: + logger.critical('\n'.join(['PRSERV_HOST: incorrect format', + 'Usage: PRSERV_HOST = ":"'])) return True - if is_local_special(d.getVar('PRSERV_HOST', True), int(d.getVar('PRSERV_PORT', True))) and not singleton: + if is_local_special(host_params[0], int(host_params[1])) and not singleton: import bb.utils cachedir = (d.getVar("PERSISTENT_DIR", True) or d.getVar("CACHE", True)) if not cachedir: @@ -285,8 +292,8 @@ def auto_start(d): if singleton: host, port = singleton.getinfo() else: - host = d.getVar('PRSERV_HOST', True) - port = int(d.getVar('PRSERV_PORT', True)) + host = host_params[0] + port = int(host_params[1]) try: return PRServerConnection(host,port).ping() -- cgit v1.2.3-54-g00ecf