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/bb/fetch2/perforce.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/bb/fetch2/perforce.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/perforce.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py index 50cb479096..be73ca0518 100644 --- a/bitbake/lib/bb/fetch2/perforce.py +++ b/bitbake/lib/bb/fetch2/perforce.py | |||
@@ -44,13 +44,13 @@ class Perforce(FetchMethod): | |||
44 | provided by the env, use it. If P4PORT is specified by the recipe, use | 44 | provided by the env, use it. If P4PORT is specified by the recipe, use |
45 | its values, which may override the settings in P4CONFIG. | 45 | its values, which may override the settings in P4CONFIG. |
46 | """ | 46 | """ |
47 | ud.basecmd = d.getVar('FETCHCMD_p4', True) | 47 | ud.basecmd = d.getVar('FETCHCMD_p4') |
48 | if not ud.basecmd: | 48 | if not ud.basecmd: |
49 | ud.basecmd = "/usr/bin/env p4" | 49 | ud.basecmd = "/usr/bin/env p4" |
50 | 50 | ||
51 | ud.dldir = d.getVar('P4DIR', True) | 51 | ud.dldir = d.getVar('P4DIR') |
52 | if not ud.dldir: | 52 | if not ud.dldir: |
53 | ud.dldir = '%s/%s' % (d.getVar('DL_DIR', True), 'p4') | 53 | ud.dldir = '%s/%s' % (d.getVar('DL_DIR'), 'p4') |
54 | 54 | ||
55 | path = ud.url.split('://')[1] | 55 | path = ud.url.split('://')[1] |
56 | path = path.split(';')[0] | 56 | path = path.split(';')[0] |
@@ -62,7 +62,7 @@ class Perforce(FetchMethod): | |||
62 | ud.path = path | 62 | ud.path = path |
63 | 63 | ||
64 | ud.usingp4config = False | 64 | ud.usingp4config = False |
65 | p4port = d.getVar('P4PORT', True) | 65 | p4port = d.getVar('P4PORT') |
66 | 66 | ||
67 | if p4port: | 67 | if p4port: |
68 | logger.debug(1, 'Using recipe provided P4PORT: %s' % p4port) | 68 | logger.debug(1, 'Using recipe provided P4PORT: %s' % p4port) |