diff options
| author | André Draszik <andre.draszik@jci.com> | 2019-01-17 14:29:17 +0000 |
|---|---|---|
| committer | André Draszik <andre.draszik@jci.com> | 2019-01-17 14:29:17 +0000 |
| commit | 74df05a7f0fd698cbbe65b9bf925f186891426ca (patch) | |
| tree | 169665d86e12f2aa2d6df71a856c1893267972d7 /classes/machine-overrides-extender.bbclass | |
| parent | 9704df97f08cf5895e2f5bcfb33f1a53d10c7704 (diff) | |
| download | meta-freescale-74df05a7f0fd698cbbe65b9bf925f186891426ca.tar.gz | |
remove True option to getVar calls
getVar() has been defaulting to expanding by default for
a long time (2016), thus remove the True option from
getVar() calls with a regex search and replace.
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Diffstat (limited to 'classes/machine-overrides-extender.bbclass')
| -rw-r--r-- | classes/machine-overrides-extender.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/machine-overrides-extender.bbclass b/classes/machine-overrides-extender.bbclass index 959fdc16c..4b7d66d51 100644 --- a/classes/machine-overrides-extender.bbclass +++ b/classes/machine-overrides-extender.bbclass | |||
| @@ -15,18 +15,18 @@ | |||
| 15 | # Copyright 2016-2018 (C) O.S. Systems Software LTDA. | 15 | # Copyright 2016-2018 (C) O.S. Systems Software LTDA. |
| 16 | 16 | ||
| 17 | def machine_overrides_extender(d): | 17 | def machine_overrides_extender(d): |
| 18 | machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES', True) or '').split(':') | 18 | machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES') or '').split(':') |
| 19 | 19 | ||
| 20 | # Gather the list of overrides to filter out | 20 | # Gather the list of overrides to filter out |
| 21 | machine_overrides_filter_out = [] | 21 | machine_overrides_filter_out = [] |
| 22 | for override in machine_overrides: | 22 | for override in machine_overrides: |
| 23 | machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT_%s' % override, True) or '').split() | 23 | machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT_%s' % override) or '').split() |
| 24 | 24 | ||
| 25 | # Drop any overrides of filter_out prior extending | 25 | # Drop any overrides of filter_out prior extending |
| 26 | machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out] | 26 | machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out] |
| 27 | 27 | ||
| 28 | for override in machine_overrides: | 28 | for override in machine_overrides: |
| 29 | extender = d.getVar('MACHINEOVERRIDES_EXTENDER_%s' % override, True) | 29 | extender = d.getVar('MACHINEOVERRIDES_EXTENDER_%s' % override) |
| 30 | 30 | ||
| 31 | if extender: | 31 | if extender: |
| 32 | extender = extender.split(':') | 32 | extender = extender.split(':') |
