diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-18 15:14:16 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-23 11:57:25 +0100 |
| commit | 86d30d756a60d181a95cf07041920a367a0cd0ba (patch) | |
| tree | 950353e2e1cd1e7b812ff941b4d06076acd2c752 /meta/classes/package_ipk.bbclass | |
| parent | f98c8490099a02c42306e1671579631a61c9df73 (diff) | |
| download | openembedded-core-contrib-86d30d756a60d181a95cf07041920a367a0cd0ba.tar.gz | |
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 *`
(From OE-Core rev: ab7c1d239b122c8e549e8112c88fd46c9e2b061b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 9fb9d53e61..e7109a9514 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -64,7 +64,7 @@ python do_package_ipk () { basedir = os.path.join(os.path.dirname(root)) arch = localdata.getVar('PACKAGE_ARCH', True) - if localdata.getVar('IPK_HIERARCHICAL_FEED') == "1": + if localdata.getVar('IPK_HIERARCHICAL_FEED', False) == "1": # Spread packages across subdirectories so each isn't too crowded if pkgname.startswith('lib'): pkg_prefix = 'lib' + pkgname[3] @@ -94,7 +94,7 @@ python do_package_ipk () { cleanupcontrol(root) from glob import glob g = glob('*') - if not g and localdata.getVar('ALLOW_EMPTY') != "1": + if not g and localdata.getVar('ALLOW_EMPTY', False) != "1": bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True))) bb.utils.unlockfile(lf) continue @@ -134,7 +134,7 @@ python do_package_ipk () { try: for (c, fs) in fields: for f in fs: - if localdata.getVar(f) is None: + if localdata.getVar(f, False) is None: raise KeyError(f) # Special behavior for description... if 'DESCRIPTION' in fs: |