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/debian.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/debian.bbclass')
-rw-r--r-- | meta/classes/debian.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass index c859703669..ada2fb5760 100644 --- a/meta/classes/debian.bbclass +++ b/meta/classes/debian.bbclass | |||
@@ -53,7 +53,7 @@ python debian_package_name_hook () { | |||
53 | return (s[stat.ST_MODE] & stat.S_IEXEC) | 53 | return (s[stat.ST_MODE] & stat.S_IEXEC) |
54 | 54 | ||
55 | def add_rprovides(pkg, d): | 55 | def add_rprovides(pkg, d): |
56 | newpkg = d.getVar('PKG_' + pkg) | 56 | newpkg = d.getVar('PKG_' + pkg, False) |
57 | if newpkg and newpkg != pkg: | 57 | if newpkg and newpkg != pkg: |
58 | provs = (d.getVar('RPROVIDES_' + pkg, True) or "").split() | 58 | provs = (d.getVar('RPROVIDES_' + pkg, True) or "").split() |
59 | if pkg not in provs: | 59 | if pkg not in provs: |
@@ -105,10 +105,10 @@ python debian_package_name_hook () { | |||
105 | if soname_result: | 105 | if soname_result: |
106 | (pkgname, devname) = soname_result | 106 | (pkgname, devname) = soname_result |
107 | for pkg in packages.split(): | 107 | for pkg in packages.split(): |
108 | if (d.getVar('PKG_' + pkg) or d.getVar('DEBIAN_NOAUTONAME_' + pkg)): | 108 | if (d.getVar('PKG_' + pkg, False) or d.getVar('DEBIAN_NOAUTONAME_' + pkg, False)): |
109 | add_rprovides(pkg, d) | 109 | add_rprovides(pkg, d) |
110 | continue | 110 | continue |
111 | debian_pn = d.getVar('DEBIANNAME_' + pkg) | 111 | debian_pn = d.getVar('DEBIANNAME_' + pkg, False) |
112 | if debian_pn: | 112 | if debian_pn: |
113 | newpkg = debian_pn | 113 | newpkg = debian_pn |
114 | elif pkg == orig_pkg: | 114 | elif pkg == orig_pkg: |