diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-25 13:26:23 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-09-30 04:20:38 -1000 |
| commit | dd705fccfb35f9d3fee1452a5145d4e7ad24999d (patch) | |
| tree | 18ef03d4278aa0efc92b531150d9cd93e455e8e1 | |
| parent | 2130363c7a8762866b523e596adf44ab63f40722 (diff) | |
| download | openembedded-core-contrib-dd705fccfb35f9d3fee1452a5145d4e7ad24999d.tar.gz | |
libc_package/buildstats: Fix python regex quoting warnings
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6a8077317ce12e13018ec4472f728dd24880bda9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes/libc-package.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/buildstats.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index de3b4250c7..1143f538d6 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -355,7 +355,7 @@ python package_do_split_gconvs () { m.write("\t@echo 'Progress %d/%d'\n" % (i, total)) m.write("\t" + makerecipe + "\n\n") d.setVar("EXTRA_OEMAKE", "-C %s ${PARALLEL_MAKE}" % (os.path.dirname(makefile))) - d.setVarFlag("oe_runmake", "progress", "outof:Progress\s(\d+)/(\d+)") + d.setVarFlag("oe_runmake", "progress", r"outof:Progress\s(\d+)/(\d+)") bb.note("Executing binary locale generation makefile") bb.build.exec_func("oe_runmake", d) bb.note("collecting binary locales from locale tree") diff --git a/meta/lib/buildstats.py b/meta/lib/buildstats.py index 8627ed3c31..c52b6c3b72 100644 --- a/meta/lib/buildstats.py +++ b/meta/lib/buildstats.py @@ -43,8 +43,8 @@ class SystemStats: # depends on the heartbeat event, which fires less often. self.min_seconds = 1 - self.meminfo_regex = re.compile(b'^(MemTotal|MemFree|Buffers|Cached|SwapTotal|SwapFree):\s*(\d+)') - self.diskstats_regex = re.compile(b'^([hsv]d.|mtdblock\d|mmcblk\d|cciss/c\d+d\d+.*)$') + self.meminfo_regex = re.compile(rb'^(MemTotal|MemFree|Buffers|Cached|SwapTotal|SwapFree):\s*(\d+)') + self.diskstats_regex = re.compile(rb'^([hsv]d.|mtdblock\d|mmcblk\d|cciss/c\d+d\d+.*)$') self.diskstats_ltime = None self.diskstats_data = None self.stat_ltimes = None |