]> code.ossystems Code Review - openembedded-core.git/commitdiff
meson.bbclass: Close the log file after reading
authorAnton Eliasson <anton.eliasson@axis.com>
Fri, 8 May 2020 14:07:04 +0000 (16:07 +0200)
committerSteve Sakoman <steve@sakoman.com>
Thu, 14 May 2020 16:32:40 +0000 (06:32 -1000)
This fixes warnings like:

    WARNING: package-name-0.0.1-r0 do_configure: <string>:164: ResourceWarning:
    unclosed file <_io.TextIOWrapper
    name='/source_directory/build/tmp/work/arch/package-name/0.0.1-r0/package-name-0.0.1//meson-logs/meson-log.txt'
    mode='r' encoding='UTF-8'>

Signed-off-by: Anton Eliasson <anton.eliasson@axis.com>
Reviewed-by: Ola x Nilsson <ola.x.nilsson@axis.com>
Signed-off-by: Anton Eliasson <anton.eliasson@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/meson.bbclass

index 06034e8b4731010546db79bae7bc14184017e6be..e9628033c685cb903c897213094de956ca448f4a 100644 (file)
@@ -164,7 +164,8 @@ meson_do_configure_prepend_class-native() {
 python meson_do_qa_configure() {
     import re
     warn_re = re.compile(r"^WARNING: Cross property (.+) is using default value (.+)$", re.MULTILINE)
-    log = open(d.expand("${B}/meson-logs/meson-log.txt")).read()
+    with open(d.expand("${B}/meson-logs/meson-log.txt")) as logfile:
+        log = logfile.read()
     for (prop, value) in warn_re.findall(log):
         bb.warn("Meson cross property %s used without explicit assignment, defaulting to %s" % (prop, value))
 }