mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
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>
This commit is contained in:
@@ -47,7 +47,7 @@ python populate_packages_prepend () {
|
||||
def update_rcd_package(pkg):
|
||||
bb.debug(1, 'adding update-rc.d calls to postinst/postrm for %s' % pkg)
|
||||
localdata = bb.data.createCopy(d)
|
||||
overrides = localdata.getVar("OVERRIDES", 1)
|
||||
overrides = localdata.getVar("OVERRIDES", True)
|
||||
localdata.setVar("OVERRIDES", "%s:%s" % (pkg, overrides))
|
||||
bb.data.update_data(localdata)
|
||||
|
||||
@@ -56,28 +56,28 @@ python populate_packages_prepend () {
|
||||
execute on the target. Not doing so may cause update_rc.d postinst invoked
|
||||
twice to cause unwanted warnings.
|
||||
"""
|
||||
postinst = localdata.getVar('pkg_postinst', 1)
|
||||
postinst = localdata.getVar('pkg_postinst', True)
|
||||
if not postinst:
|
||||
postinst = '#!/bin/sh\n'
|
||||
postinst += localdata.getVar('updatercd_postinst', 1)
|
||||
postinst += localdata.getVar('updatercd_postinst', True)
|
||||
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
||||
|
||||
prerm = localdata.getVar('pkg_prerm', 1)
|
||||
prerm = localdata.getVar('pkg_prerm', True)
|
||||
if not prerm:
|
||||
prerm = '#!/bin/sh\n'
|
||||
prerm += localdata.getVar('updatercd_prerm', 1)
|
||||
prerm += localdata.getVar('updatercd_prerm', True)
|
||||
d.setVar('pkg_prerm_%s' % pkg, prerm)
|
||||
|
||||
postrm = localdata.getVar('pkg_postrm', 1)
|
||||
postrm = localdata.getVar('pkg_postrm', True)
|
||||
if not postrm:
|
||||
postrm = '#!/bin/sh\n'
|
||||
postrm += localdata.getVar('updatercd_postrm', 1)
|
||||
postrm += localdata.getVar('updatercd_postrm', True)
|
||||
d.setVar('pkg_postrm_%s' % pkg, postrm)
|
||||
|
||||
pkgs = d.getVar('INITSCRIPT_PACKAGES', 1)
|
||||
pkgs = d.getVar('INITSCRIPT_PACKAGES', True)
|
||||
if pkgs == None:
|
||||
pkgs = d.getVar('UPDATERCPN', 1)
|
||||
packages = (d.getVar('PACKAGES', 1) or "").split()
|
||||
pkgs = d.getVar('UPDATERCPN', True)
|
||||
packages = (d.getVar('PACKAGES', True) or "").split()
|
||||
if not pkgs in packages and packages != []:
|
||||
pkgs = packages[0]
|
||||
for pkg in pkgs.split():
|
||||
|
||||
Reference in New Issue
Block a user