From 065dab7480ea0fae66db4b5a01d09814b1f38e03 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Mar 2012 11:21:22 +0000 Subject: meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx) sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie --- meta/recipes-core/base-passwd/base-passwd_3.5.22.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/base-passwd') diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb index 92ad0d977..ae3864c0a 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb @@ -63,10 +63,10 @@ python populate_packages_prepend() { # time before the files from the package may be available, hence # storing the data from the files in the preinst directly. - f = open(bb.data.expand("${STAGING_DATADIR}/base-passwd/passwd.master", d), 'r') + f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') passwd = "".join(f.readlines()) f.close() - f = open(bb.data.expand("${STAGING_DATADIR}/base-passwd/group.master", d), 'r') + f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') group = "".join(f.readlines()) f.close() -- cgit v1.2.3