summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_ipk.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-18 15:14:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:57:25 +0100
commit86d30d756a60d181a95cf07041920a367a0cd0ba (patch)
tree950353e2e1cd1e7b812ff941b4d06076acd2c752 /meta/classes/package_ipk.bbclass
parentf98c8490099a02c42306e1671579631a61c9df73 (diff)
downloadpoky-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.bbclass6
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 () {
64 basedir = os.path.join(os.path.dirname(root)) 64 basedir = os.path.join(os.path.dirname(root))
65 arch = localdata.getVar('PACKAGE_ARCH', True) 65 arch = localdata.getVar('PACKAGE_ARCH', True)
66 66
67 if localdata.getVar('IPK_HIERARCHICAL_FEED') == "1": 67 if localdata.getVar('IPK_HIERARCHICAL_FEED', False) == "1":
68 # Spread packages across subdirectories so each isn't too crowded 68 # Spread packages across subdirectories so each isn't too crowded
69 if pkgname.startswith('lib'): 69 if pkgname.startswith('lib'):
70 pkg_prefix = 'lib' + pkgname[3] 70 pkg_prefix = 'lib' + pkgname[3]
@@ -94,7 +94,7 @@ python do_package_ipk () {
94 cleanupcontrol(root) 94 cleanupcontrol(root)
95 from glob import glob 95 from glob import glob
96 g = glob('*') 96 g = glob('*')
97 if not g and localdata.getVar('ALLOW_EMPTY') != "1": 97 if not g and localdata.getVar('ALLOW_EMPTY', False) != "1":
98 bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True))) 98 bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True)))
99 bb.utils.unlockfile(lf) 99 bb.utils.unlockfile(lf)
100 continue 100 continue
@@ -134,7 +134,7 @@ python do_package_ipk () {
134 try: 134 try:
135 for (c, fs) in fields: 135 for (c, fs) in fields:
136 for f in fs: 136 for f in fs:
137 if localdata.getVar(f) is None: 137 if localdata.getVar(f, False) is None:
138 raise KeyError(f) 138 raise KeyError(f)
139 # Special behavior for description... 139 # Special behavior for description...
140 if 'DESCRIPTION' in fs: 140 if 'DESCRIPTION' in fs: