diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2016-11-23 13:23:44 +0000 |
|---|---|---|
| committer | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-05 15:36:27 +0000 |
| commit | cc01d32cc0843bcae6656a8ec3c694f64f2637d9 (patch) | |
| tree | 00c54fe9d16dffd69a58c18c1b3f6e0ef121d616 /meta/classes/compress_doc.bbclass | |
| parent | 65250a5537da220dff662269cb81d086b66c2ace (diff) | |
| download | openembedded-core-contrib-joshuagl/getvar.tar.gz | |
meta: remove True option to getVarFlag callsjoshuagl/getvar
getVarFlag() now defaults to expanding by default, thus remove the
True option from getVarFlag() calls with a regex search and
replace.
Search made with the following regex:
getVarFlag ?\(( ?[^,()]*, ?[^,()]*), True\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Diffstat (limited to 'meta/classes/compress_doc.bbclass')
| -rw-r--r-- | meta/classes/compress_doc.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/compress_doc.bbclass b/meta/classes/compress_doc.bbclass index 069db1997b..ba9772174e 100644 --- a/meta/classes/compress_doc.bbclass +++ b/meta/classes/compress_doc.bbclass @@ -40,8 +40,8 @@ python package_do_compress_doc() { compress_cmds = {} decompress_cmds = {} for mode in compress_list: - compress_cmds[mode] = d.getVarFlag('DOC_COMPRESS_CMD', mode, True) - decompress_cmds[mode] = d.getVarFlag('DOC_DECOMPRESS_CMD', mode, True) + compress_cmds[mode] = d.getVarFlag('DOC_COMPRESS_CMD', mode) + decompress_cmds[mode] = d.getVarFlag('DOC_DECOMPRESS_CMD', mode) mandir = os.path.abspath(dvar + os.sep + d.getVar("mandir")) if os.path.exists(mandir): @@ -225,9 +225,9 @@ python compress_doc_updatealternatives () { old_names = (d.getVar('ALTERNATIVE_%s' % pkg) or "").split() new_names = [] for old_name in old_names: - old_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', old_name, True) - old_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name, True) or \ - d.getVarFlag('ALTERNATIVE_TARGET', old_name, True) or \ + old_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', old_name) + old_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name) or \ + d.getVarFlag('ALTERNATIVE_TARGET', old_name) or \ d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or \ d.getVar('ALTERNATIVE_TARGET') or \ old_link @@ -241,10 +241,10 @@ python compress_doc_updatealternatives () { new_target = old_target + '.' + compress_mode d.delVarFlag('ALTERNATIVE_LINK_NAME', old_name) d.setVarFlag('ALTERNATIVE_LINK_NAME', new_name, new_link) - if d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name, True): + if d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name): d.delVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name) d.setVarFlag('ALTERNATIVE_TARGET_%s' % pkg, new_name, new_target) - elif d.getVarFlag('ALTERNATIVE_TARGET', old_name, True): + elif d.getVarFlag('ALTERNATIVE_TARGET', old_name): d.delVarFlag('ALTERNATIVE_TARGET', old_name) d.setVarFlag('ALTERNATIVE_TARGET', new_name, new_target) elif d.getVar('ALTERNATIVE_TARGET_%s' % pkg): |