mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/parselogs: Fix quoting

Browse Source 
Fix deprecation warnings about invalid escape sequences.

(From OE-Core rev: 3f23e40581f90b6a7c5a280e049a0188b8be8d75)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 43542614395150e8fa34133ba0fc7ee90f215bcb)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-11-26 15:45:29 +00:00
parent 038e25aec3
commit 746b301d37
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/runtime/cases/parselogs.py
+7 -7
View File
@@ -296,7 +296,7 @@ class ParseLogsTest(OERuntimeTestCase):
grepcmd = 'grep ' grepcmd = 'grep '
grepcmd += '-Ei "' grepcmd += '-Ei "'
for error in errors: for error in errors:
grepcmd += '\<' + error + '\>' + '|' grepcmd += r'\<' + error + r'\>' + '|'
grepcmd = grepcmd[:-1] grepcmd = grepcmd[:-1]
grepcmd += '" ' + str(log) + " | grep -Eiv \'" grepcmd += '" ' + str(log) + " | grep -Eiv \'"
@@ -307,13 +307,13 @@ class ParseLogsTest(OERuntimeTestCase):
errorlist = ignore_errors['default'] errorlist = ignore_errors['default']
for ignore_error in errorlist: for ignore_error in errorlist:
ignore_error = ignore_error.replace('(', '\(') ignore_error = ignore_error.replace('(', r'\(')
ignore_error = ignore_error.replace(')', '\)') ignore_error = ignore_error.replace(')', r'\)')
ignore_error = ignore_error.replace("'", '.') ignore_error = ignore_error.replace("'", '.')
ignore_error = ignore_error.replace('?', '\?') ignore_error = ignore_error.replace('?', r'\?')
ignore_error = ignore_error.replace('[', '\[') ignore_error = ignore_error.replace('[', r'\[')
ignore_error = ignore_error.replace(']', '\]') ignore_error = ignore_error.replace(']', r'\]')
ignore_error = ignore_error.replace('*', '\*') ignore_error = ignore_error.replace('*', r'\*')
ignore_error = ignore_error.replace('0-9', '[0-9]') ignore_error = ignore_error.replace('0-9', '[0-9]')
grepcmd += ignore_error + '|' grepcmd += ignore_error + '|'
grepcmd = grepcmd[:-1] grepcmd = grepcmd[:-1]