From 4bc072c7fb48995d996546230eb034f232243376 Mon Sep 17 00:00:00 2001 From: Ola x Nilsson Date: Mon, 21 Oct 2019 12:30:33 +0200 Subject: devtool-source.bbclass: Use with to manage file handle lifetime Replace copy-and-if with a filtering list comprehension. (From OE-Core rev: eb763856be8da854d37c7d4b8e8d645ab1d3fa06) Signed-off-by: Ola x Nilsson Signed-off-by: Richard Purdie --- meta/classes/devtool-source.bbclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'meta/classes/devtool-source.bbclass') diff --git a/meta/classes/devtool-source.bbclass b/meta/classes/devtool-source.bbclass index a8110006fb..280d6009f3 100644 --- a/meta/classes/devtool-source.bbclass +++ b/meta/classes/devtool-source.bbclass @@ -97,17 +97,15 @@ python devtool_post_unpack() { local_files = oe.recipeutils.get_recipe_local_files(d) if is_kernel_yocto: - for key in local_files.copy(): - if key.endswith('scc'): - sccfile = open(local_files[key], 'r') + for key in [f for f in local_files if f.endswith('scc')]: + with open(local_files[key], 'r') as sccfile: for l in sccfile: line = l.split() if line and line[0] in ('kconf', 'patch'): cfg = os.path.join(os.path.dirname(local_files[key]), line[-1]) - if not cfg in local_files.values(): + if cfg not in local_files.values(): local_files[line[-1]] = cfg shutil.copy2(cfg, workdir) - sccfile.close() # Ignore local files with subdir={BP} srcabspath = os.path.abspath(srcsubdir) -- cgit v1.2.3-54-g00ecf