diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-03 10:59:25 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-05 10:22:56 -0800 |
| commit | 06f2f8ce0a3093973ca54b48f542f8485b666079 (patch) | |
| tree | dbcfa5c491eb2e5d237aa539cb7c6e77dc07dd6f /meta/classes/gtk-icon-cache.bbclass | |
| parent | d01dadfb87cfd2284b3e849d35a35fe5df0239c4 (diff) | |
| download | poky-06f2f8ce0a3093973ca54b48f542f8485b666079.tar.gz | |
meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:
sed \
-e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
-e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
-i `grep -ril getVar *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/gtk-icon-cache.bbclass')
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index 0204fd3fec..60e3401f4b 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass | |||
| @@ -28,31 +28,31 @@ done | |||
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | python populate_packages_append () { | 30 | python populate_packages_append () { |
| 31 | packages = d.getVar('PACKAGES', 1).split() | 31 | packages = d.getVar('PACKAGES', True).split() |
| 32 | pkgdest = d.getVar('PKGDEST', 1) | 32 | pkgdest = d.getVar('PKGDEST', True) |
| 33 | 33 | ||
| 34 | for pkg in packages: | 34 | for pkg in packages: |
| 35 | icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, d.getVar('datadir', 1)) | 35 | icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, d.getVar('datadir', True)) |
| 36 | if not os.path.exists(icon_dir): | 36 | if not os.path.exists(icon_dir): |
| 37 | continue | 37 | continue |
| 38 | 38 | ||
| 39 | bb.note("adding hicolor-icon-theme dependency to %s" % pkg) | 39 | bb.note("adding hicolor-icon-theme dependency to %s" % pkg) |
| 40 | rdepends = d.getVar('RDEPENDS_%s' % pkg, 1) | 40 | rdepends = d.getVar('RDEPENDS_%s' % pkg, True) |
| 41 | rdepends = rdepends + ' ' + d.getVar('MLPREFIX') + "hicolor-icon-theme" | 41 | rdepends = rdepends + ' ' + d.getVar('MLPREFIX') + "hicolor-icon-theme" |
| 42 | d.setVar('RDEPENDS_%s' % pkg, rdepends) | 42 | d.setVar('RDEPENDS_%s' % pkg, rdepends) |
| 43 | 43 | ||
| 44 | bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg) | 44 | bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg) |
| 45 | 45 | ||
| 46 | postinst = d.getVar('pkg_postinst_%s' % pkg, 1) or d.getVar('pkg_postinst', 1) | 46 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) |
| 47 | if not postinst: | 47 | if not postinst: |
| 48 | postinst = '#!/bin/sh\n' | 48 | postinst = '#!/bin/sh\n' |
| 49 | postinst += d.getVar('gtk_icon_cache_postinst', 1) | 49 | postinst += d.getVar('gtk_icon_cache_postinst', True) |
| 50 | d.setVar('pkg_postinst_%s' % pkg, postinst) | 50 | d.setVar('pkg_postinst_%s' % pkg, postinst) |
| 51 | 51 | ||
| 52 | postrm = d.getVar('pkg_postrm_%s' % pkg, 1) or d.getVar('pkg_postrm', 1) | 52 | postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) |
| 53 | if not postrm: | 53 | if not postrm: |
| 54 | postrm = '#!/bin/sh\n' | 54 | postrm = '#!/bin/sh\n' |
| 55 | postrm += d.getVar('gtk_icon_cache_postrm', 1) | 55 | postrm += d.getVar('gtk_icon_cache_postrm', True) |
| 56 | d.setVar('pkg_postrm_%s' % pkg, postrm) | 56 | d.setVar('pkg_postrm_%s' % pkg, postrm) |
| 57 | } | 57 | } |
| 58 | 58 | ||
