diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/classes/gsettings.bbclass | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/gsettings.bbclass')
-rw-r--r-- | meta/classes/gsettings.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/gsettings.bbclass b/meta/classes/gsettings.bbclass index dec5abc026..e6d1c8a893 100644 --- a/meta/classes/gsettings.bbclass +++ b/meta/classes/gsettings.bbclass | |||
@@ -18,20 +18,20 @@ gsettings_postinstrm () { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | python populate_packages_append () { | 20 | python populate_packages_append () { |
21 | pkg = d.getVar('PN', True) | 21 | pkg = d.getVar('PN') |
22 | bb.note("adding gsettings postinst scripts to %s" % pkg) | 22 | bb.note("adding gsettings postinst scripts to %s" % pkg) |
23 | 23 | ||
24 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) | 24 | postinst = d.getVar('pkg_postinst_%s' % pkg) or d.getVar('pkg_postinst') |
25 | if not postinst: | 25 | if not postinst: |
26 | postinst = '#!/bin/sh\n' | 26 | postinst = '#!/bin/sh\n' |
27 | postinst += d.getVar('gsettings_postinstrm', True) | 27 | postinst += d.getVar('gsettings_postinstrm') |
28 | d.setVar('pkg_postinst_%s' % pkg, postinst) | 28 | d.setVar('pkg_postinst_%s' % pkg, postinst) |
29 | 29 | ||
30 | bb.note("adding gsettings postrm scripts to %s" % pkg) | 30 | bb.note("adding gsettings postrm scripts to %s" % pkg) |
31 | 31 | ||
32 | postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) | 32 | postrm = d.getVar('pkg_postrm_%s' % pkg) or d.getVar('pkg_postrm') |
33 | if not postrm: | 33 | if not postrm: |
34 | postrm = '#!/bin/sh\n' | 34 | postrm = '#!/bin/sh\n' |
35 | postrm += d.getVar('gsettings_postinstrm', True) | 35 | postrm += d.getVar('gsettings_postinstrm') |
36 | d.setVar('pkg_postrm_%s' % pkg, postrm) | 36 | d.setVar('pkg_postrm_%s' % pkg, postrm) |
37 | } | 37 | } |