diff options
author | Constantin Musca <constantinx.musca@intel.com> | 2013-01-23 16:54:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-23 16:03:33 +0000 |
commit | ad62eed9e1f0867a406e9fbfa44916a0f1ad1282 (patch) | |
tree | 6d9cc022cf81ae78305e631c0bb78ef85b00b32a /lib | |
parent | 90aabeb87d6c1f00d6333cc9930626d36b6d9709 (diff) | |
download | bitbake-ad62eed9e1f0867a406e9fbfa44916a0f1ad1282.tar.gz |
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]
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/prserv/serv.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/prserv/serv.py b/lib/prserv/serv.py index 5567c6f57..d8bdf31ba 100644 --- a/lib/prserv/serv.py +++ b/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 = "<hostname>:<port>"'])) 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() |