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_deb.bbclass | |
parent | f98c8490099a02c42306e1671579631a61c9df73 (diff) | |
download | poky-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_deb.bbclass')
-rw-r--r-- | meta/classes/package_deb.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index d79766361f..a165a9ab9b 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -87,7 +87,7 @@ python do_package_deb () { | |||
87 | cleanupcontrol(root) | 87 | cleanupcontrol(root) |
88 | from glob import glob | 88 | from glob import glob |
89 | g = glob('*') | 89 | g = glob('*') |
90 | if not g and localdata.getVar('ALLOW_EMPTY') != "1": | 90 | if not g and localdata.getVar('ALLOW_EMPTY', False) != "1": |
91 | bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True))) | 91 | bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True))) |
92 | bb.utils.unlockfile(lf) | 92 | bb.utils.unlockfile(lf) |
93 | continue | 93 | continue |
@@ -144,7 +144,7 @@ python do_package_deb () { | |||
144 | try: | 144 | try: |
145 | for (c, fs) in fields: | 145 | for (c, fs) in fields: |
146 | for f in fs: | 146 | for f in fs: |
147 | if localdata.getVar(f) is None: | 147 | if localdata.getVar(f, False) is None: |
148 | raise KeyError(f) | 148 | raise KeyError(f) |
149 | # Special behavior for description... | 149 | # Special behavior for description... |
150 | if 'DESCRIPTION' in fs: | 150 | if 'DESCRIPTION' in fs: |