summaryrefslogtreecommitdiffstats
path: root/meta/classes/compress_doc.bbclass
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-12-14 21:13:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-16 10:23:23 (GMT)
commit3c59b1bf93adb0b9f723bda1d8702c8720733677 (patch)
treed1939643e2d02f0ce2e9ef33e235cd23cd5000d3 /meta/classes/compress_doc.bbclass
parentc0f2890c01882e9ea14e781c044f3a84f75bd0fc (diff)
downloadpoky-3c59b1bf93adb0b9f723bda1d8702c8720733677.tar.gz
meta: remove True option to getVarFlag calls
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\) (From OE-Core rev: 2dea9e490a98377010b3d4118d054814c317a735) 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 'meta/classes/compress_doc.bbclass')
-rw-r--r--meta/classes/compress_doc.bbclass14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/compress_doc.bbclass b/meta/classes/compress_doc.bbclass
index 069db19..ba97721 100644
--- a/meta/classes/compress_doc.bbclass
+++ b/meta/classes/compress_doc.bbclass
@@ -40,8 +40,8 @@ python package_do_compress_doc() {
40 compress_cmds = {} 40 compress_cmds = {}
41 decompress_cmds = {} 41 decompress_cmds = {}
42 for mode in compress_list: 42 for mode in compress_list:
43 compress_cmds[mode] = d.getVarFlag('DOC_COMPRESS_CMD', mode, True) 43 compress_cmds[mode] = d.getVarFlag('DOC_COMPRESS_CMD', mode)
44 decompress_cmds[mode] = d.getVarFlag('DOC_DECOMPRESS_CMD', mode, True) 44 decompress_cmds[mode] = d.getVarFlag('DOC_DECOMPRESS_CMD', mode)
45 45
46 mandir = os.path.abspath(dvar + os.sep + d.getVar("mandir")) 46 mandir = os.path.abspath(dvar + os.sep + d.getVar("mandir"))
47 if os.path.exists(mandir): 47 if os.path.exists(mandir):
@@ -225,9 +225,9 @@ python compress_doc_updatealternatives () {
225 old_names = (d.getVar('ALTERNATIVE_%s' % pkg) or "").split() 225 old_names = (d.getVar('ALTERNATIVE_%s' % pkg) or "").split()
226 new_names = [] 226 new_names = []
227 for old_name in old_names: 227 for old_name in old_names:
228 old_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', old_name, True) 228 old_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', old_name)
229 old_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name, True) or \ 229 old_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name) or \
230 d.getVarFlag('ALTERNATIVE_TARGET', old_name, True) or \ 230 d.getVarFlag('ALTERNATIVE_TARGET', old_name) or \
231 d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or \ 231 d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or \
232 d.getVar('ALTERNATIVE_TARGET') or \ 232 d.getVar('ALTERNATIVE_TARGET') or \
233 old_link 233 old_link
@@ -241,10 +241,10 @@ python compress_doc_updatealternatives () {
241 new_target = old_target + '.' + compress_mode 241 new_target = old_target + '.' + compress_mode
242 d.delVarFlag('ALTERNATIVE_LINK_NAME', old_name) 242 d.delVarFlag('ALTERNATIVE_LINK_NAME', old_name)
243 d.setVarFlag('ALTERNATIVE_LINK_NAME', new_name, new_link) 243 d.setVarFlag('ALTERNATIVE_LINK_NAME', new_name, new_link)
244 if d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name, True): 244 if d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name):
245 d.delVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name) 245 d.delVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name)
246 d.setVarFlag('ALTERNATIVE_TARGET_%s' % pkg, new_name, new_target) 246 d.setVarFlag('ALTERNATIVE_TARGET_%s' % pkg, new_name, new_target)
247 elif d.getVarFlag('ALTERNATIVE_TARGET', old_name, True): 247 elif d.getVarFlag('ALTERNATIVE_TARGET', old_name):
248 d.delVarFlag('ALTERNATIVE_TARGET', old_name) 248 d.delVarFlag('ALTERNATIVE_TARGET', old_name)
249 d.setVarFlag('ALTERNATIVE_TARGET', new_name, new_target) 249 d.setVarFlag('ALTERNATIVE_TARGET', new_name, new_target)
250 elif d.getVar('ALTERNATIVE_TARGET_%s' % pkg): 250 elif d.getVar('ALTERNATIVE_TARGET_%s' % pkg):