]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
rootfs.py: close kernel_abi_ver_file
authorMartin Jansa <Martin.Jansa@gmail.com>
Tue, 7 Jun 2022 20:52:42 +0000 (22:52 +0200)
committerSteve Sakoman <steve@sakoman.com>
Wed, 15 Jun 2022 16:40:10 +0000 (06:40 -1000)
* fixes:
  oe-core/meta/lib/oe/rootfs.py:331: ResourceWarning: unclosed file <_io.TextIOWrapper name='pkgdata/mach/kernel-depmod/kernel-abiversion' mode='r' encoding='UTF-8'>
  kernel_ver = open(kernel_abi_ver_file).read().strip(' \n')

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f9dd8ee063c1132265248457fcd628e1e93727be)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/lib/oe/rootfs.py

index 9e9f7f1f08715d6b2804b66ec912d37aabf9bfe8..5391c25af9872a66f0ec73fb961cc8a2b8b3988d 100644 (file)
@@ -321,7 +321,9 @@ class Rootfs(object, metaclass=ABCMeta):
         if not os.path.exists(kernel_abi_ver_file):
             bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file)
 
-        kernel_ver = open(kernel_abi_ver_file).read().strip(' \n')
+        with open(kernel_abi_ver_file) as f:
+            kernel_ver = f.read().strip(' \n')
+
         versioned_modules_dir = os.path.join(self.image_rootfs, modules_dir, kernel_ver)
 
         bb.utils.mkdirhier(versioned_modules_dir)