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/update-alternatives.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/update-alternatives.bbclass')
-rw-r--r-- | meta/classes/update-alternatives.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 0e8e58bd03..ae58344d3d 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass | |||
@@ -94,22 +94,22 @@ python __anonymous() { | |||
94 | } | 94 | } |
95 | 95 | ||
96 | python populate_packages_prepend () { | 96 | python populate_packages_prepend () { |
97 | pkg = d.getVar('PN', 1) | 97 | pkg = d.getVar('PN', True) |
98 | bb.note('adding update-alternatives calls to postinst/postrm for %s' % pkg) | 98 | bb.note('adding update-alternatives calls to postinst/postrm for %s' % pkg) |
99 | postinst = d.getVar('pkg_postinst_%s' % pkg, 1) or d.getVar('pkg_postinst', 1) | 99 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) |
100 | if not postinst: | 100 | if not postinst: |
101 | postinst = '#!/bin/sh\n' | 101 | postinst = '#!/bin/sh\n' |
102 | if d.getVar('ALTERNATIVE_LINKS') != None: | 102 | if d.getVar('ALTERNATIVE_LINKS') != None: |
103 | postinst += d.getVar('update_alternatives_batch_postinst', 1) | 103 | postinst += d.getVar('update_alternatives_batch_postinst', True) |
104 | else: | 104 | else: |
105 | postinst += d.getVar('update_alternatives_postinst', 1) | 105 | postinst += d.getVar('update_alternatives_postinst', True) |
106 | d.setVar('pkg_postinst_%s' % pkg, postinst) | 106 | d.setVar('pkg_postinst_%s' % pkg, postinst) |
107 | postrm = d.getVar('pkg_postrm_%s' % pkg, 1) or d.getVar('pkg_postrm', 1) | 107 | postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) |
108 | if not postrm: | 108 | if not postrm: |
109 | postrm = '#!/bin/sh\n' | 109 | postrm = '#!/bin/sh\n' |
110 | if d.getVar('ALTERNATIVE_LINKS') != None: | 110 | if d.getVar('ALTERNATIVE_LINKS') != None: |
111 | postrm += d.getVar('update_alternatives_batch_postrm', 1) | 111 | postrm += d.getVar('update_alternatives_batch_postrm', True) |
112 | else: | 112 | else: |
113 | postrm += d.getVar('update_alternatives_postrm', 1) | 113 | postrm += d.getVar('update_alternatives_postrm', True) |
114 | d.setVar('pkg_postrm_%s' % pkg, postrm) | 114 | d.setVar('pkg_postrm_%s' % pkg, postrm) |
115 | } | 115 | } |