diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c0f2890c01882e9ea14e781c044f3a84f75bd0fc (patch) | |
tree | 0962d17b0bf752ba4c009fb624f044b89fd6fd87 /scripts/lib/devtool/sdk.py | |
parent | c4e2c59088765d1f1de7ec57cde91980f887c2ff (diff) | |
download | poky-c0f2890c01882e9ea14e781c044f3a84f75bd0fc.tar.gz |
scripts: 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\)
(From OE-Core rev: 0a36bd96e6b29fd99a296efc358ca3e9fb5af735)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/sdk.py')
-rw-r--r-- | scripts/lib/devtool/sdk.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py index 922277b79f..f629db1876 100644 --- a/scripts/lib/devtool/sdk.py +++ b/scripts/lib/devtool/sdk.py | |||
@@ -132,9 +132,9 @@ def sdk_update(args, config, basepath, workspace): | |||
132 | # Grab variable values | 132 | # Grab variable values |
133 | tinfoil = setup_tinfoil(config_only=True, basepath=basepath) | 133 | tinfoil = setup_tinfoil(config_only=True, basepath=basepath) |
134 | try: | 134 | try: |
135 | stamps_dir = tinfoil.config_data.getVar('STAMPS_DIR', True) | 135 | stamps_dir = tinfoil.config_data.getVar('STAMPS_DIR') |
136 | sstate_mirrors = tinfoil.config_data.getVar('SSTATE_MIRRORS', True) | 136 | sstate_mirrors = tinfoil.config_data.getVar('SSTATE_MIRRORS') |
137 | site_conf_version = tinfoil.config_data.getVar('SITE_CONF_VERSION', True) | 137 | site_conf_version = tinfoil.config_data.getVar('SITE_CONF_VERSION') |
138 | finally: | 138 | finally: |
139 | tinfoil.shutdown() | 139 | tinfoil.shutdown() |
140 | 140 | ||
@@ -273,7 +273,7 @@ def sdk_install(args, config, basepath, workspace): | |||
273 | rd = parse_recipe(config, tinfoil, recipe, True) | 273 | rd = parse_recipe(config, tinfoil, recipe, True) |
274 | if not rd: | 274 | if not rd: |
275 | return 1 | 275 | return 1 |
276 | stampprefixes[recipe] = '%s.%s' % (rd.getVar('STAMP', True), tasks[0]) | 276 | stampprefixes[recipe] = '%s.%s' % (rd.getVar('STAMP'), tasks[0]) |
277 | if checkstamp(recipe): | 277 | if checkstamp(recipe): |
278 | logger.info('%s is already installed' % recipe) | 278 | logger.info('%s is already installed' % recipe) |
279 | else: | 279 | else: |