From ab7c1d239b122c8e549e8112c88fd46c9e2b061b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 18 Jun 2015 15:14:16 +0100 Subject: meta: Add explict getVar param for (non) expansion Rather than just use d.getVar(X), use the more explict d.getVar(X, False) since at some point in the future, having the default of expansion would be nice. This is the first step towards that. This patch was mostly made using the command: sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *` Signed-off-by: Richard Purdie --- meta/recipes-extended/lsof/lsof_4.88.bb | 4 ++-- meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/lsof/lsof_4.88.bb b/meta/recipes-extended/lsof/lsof_4.88.bb index bc8774f9da..c0f34b6fed 100644 --- a/meta/recipes-extended/lsof/lsof_4.88.bb +++ b/meta/recipes-extended/lsof/lsof_4.88.bb @@ -17,12 +17,12 @@ LIC_FILES_CHKSUM = "file://${S}/00README;beginline=645;endline=679;md5=964df275d python do_unpack () { # temporarily change S for unpack # of lsof_${PV} - s = d.getVar('S') + s = d.getVar('S', False) d.setVar('S', '${WORKDIR}/lsof_${PV}') bb.build.exec_func('base_do_unpack', d) # temporarily change SRC_URI for unpack # of lsof_${PV}_src - src_uri = d.getVar('SRC_URI') + src_uri = d.getVar('SRC_URI', False) d.setVar('SRC_URI', '${LOCALSRC}') d.setVar('S', s) bb.build.exec_func('base_do_unpack', d) diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 31b71e2bc3..3cb23051f8 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -204,8 +204,8 @@ RDEPENDS_packagegroup-core-lsb-python = "\ " def get_libqt3(d): - if 'linuxstdbase' in d.getVar('DISTROOVERRIDES') or "": - if 'qt3' in d.getVar('BBFILE_COLLECTIONS') or "": + if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False) or "": + if 'qt3' in d.getVar('BBFILE_COLLECTIONS', False) or "": return 'libqt-mt3' bb.warn('The meta-qt3 layer should be added, this layer provides Qt 3.x' \ -- cgit 1.2.3-korg