diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:09 +0000 |
commit | 1fce7ecbbb004a5ad82da3eef79cfd52b276708d (patch) | |
tree | dc19c8ecb8e0b04ba5eafd27a7679bb55585a868 /bitbake/lib/prserv/serv.py | |
parent | 1d0c124cdf0282b8d139063409e40982f0ec9888 (diff) | |
download | poky-1fce7ecbbb004a5ad82da3eef79cfd52b276708d.tar.gz |
bitbake: bitbake: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(Bitbake rev: 3b45c479de8640f92dd1d9f147b02e1eecfaadc8)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/prserv/serv.py')
-rw-r--r-- | bitbake/lib/prserv/serv.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index cafcc820cd..350b085a51 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py | |||
@@ -420,7 +420,7 @@ class PRServiceConfigError(Exception): | |||
420 | def auto_start(d): | 420 | def auto_start(d): |
421 | global singleton | 421 | global singleton |
422 | 422 | ||
423 | host_params = list(filter(None, (d.getVar('PRSERV_HOST', True) or '').split(':'))) | 423 | host_params = list(filter(None, (d.getVar('PRSERV_HOST') or '').split(':'))) |
424 | if not host_params: | 424 | if not host_params: |
425 | return None | 425 | return None |
426 | 426 | ||
@@ -431,7 +431,7 @@ def auto_start(d): | |||
431 | 431 | ||
432 | if is_local_special(host_params[0], int(host_params[1])) and not singleton: | 432 | if is_local_special(host_params[0], int(host_params[1])) and not singleton: |
433 | import bb.utils | 433 | import bb.utils |
434 | cachedir = (d.getVar("PERSISTENT_DIR", True) or d.getVar("CACHE", True)) | 434 | cachedir = (d.getVar("PERSISTENT_DIR") or d.getVar("CACHE")) |
435 | if not cachedir: | 435 | if not cachedir: |
436 | logger.critical("Please set the 'PERSISTENT_DIR' or 'CACHE' variable") | 436 | logger.critical("Please set the 'PERSISTENT_DIR' or 'CACHE' variable") |
437 | raise PRServiceConfigError | 437 | raise PRServiceConfigError |