summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.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_rpm.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_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 3988b730f3..271b9ae772 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -395,7 +395,7 @@ python write_specfile () {
395 395
396 file_list = [] 396 file_list = []
397 walk_files(root, file_list, conffiles, dirfiles) 397 walk_files(root, file_list, conffiles, dirfiles)
398 if not file_list and localdata.getVar('ALLOW_EMPTY') != "1": 398 if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1":
399 bb.note("Not creating empty RPM package for %s" % splitname) 399 bb.note("Not creating empty RPM package for %s" % splitname)
400 else: 400 else:
401 bb.note("Creating RPM package for %s" % splitname) 401 bb.note("Creating RPM package for %s" % splitname)
@@ -504,7 +504,7 @@ python write_specfile () {
504 # Now process files 504 # Now process files
505 file_list = [] 505 file_list = []
506 walk_files(root, file_list, conffiles, dirfiles) 506 walk_files(root, file_list, conffiles, dirfiles)
507 if not file_list and localdata.getVar('ALLOW_EMPTY') != "1": 507 if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1":
508 bb.note("Not creating empty RPM package for %s" % splitname) 508 bb.note("Not creating empty RPM package for %s" % splitname)
509 else: 509 else:
510 spec_files_bottom.append('%%files -n %s' % splitname) 510 spec_files_bottom.append('%%files -n %s' % splitname)