From: Steve Sakoman <steve@sakoman.com>
To: bitbake-devel@lists.openembedded.org
Subject: [bitbake][dunfell][1.46][PATCH 5/8] bitbake: adjust parser error check for python 3.10 compatibility
Date: Tue, 19 Oct 2021 10:06:13 -1000 [thread overview]
Message-ID: <fd6f6c225a0eb1fd2166d93b343d4a5254a16721.1634673786.git.steve@sakoman.com> (raw)
In-Reply-To: <cover.1634673786.git.steve@sakoman.com>
From: Alexander Kanavin <alex.kanavin@gmail.com>
The change was introduced in
https://github.com/python/cpython/commit/a698d52c3975c80b45b139b2f08402ec514dce75
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8d3c6cbbe6ee734495713ae3b99c609527842506)
Signed-off-by: Justin Bronder <jsbronder@cold-front.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
lib/bb/data_smart.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index c8d2a437..c46d3f0a 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -403,7 +403,7 @@ class DataSmart(MutableMapping):
s = __expand_python_regexp__.sub(varparse.python_sub, s)
except SyntaxError as e:
# Likely unmatched brackets, just don't expand the expression
- if e.msg != "EOL while scanning string literal":
+ if e.msg != "EOL while scanning string literal" and not e.msg.startswith("unterminated string literal"):
raise
if s == olds:
break
--
2.25.1
next prev parent reply other threads:[~2021-10-19 20:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-19 20:06 [bitbake][dunfell][1.46][PATCH 0/8] Patch review Steve Sakoman
2021-10-19 20:06 ` [bitbake][dunfell][1.46][PATCH 1/8] compat.py: remove file since it no longer actually implements anything Steve Sakoman
2021-10-19 20:06 ` [bitbake][dunfell][1.46][PATCH 2/8] bitbake: correct the collections vs collections.abc deprecation Steve Sakoman
2021-10-19 20:06 ` [bitbake][dunfell][1.46][PATCH 3/8] bitbake: fix regexp deprecation warnings Steve Sakoman
2021-10-19 20:06 ` [bitbake][dunfell][1.46][PATCH 4/8] bitbake: do not import imp in layerindexlib Steve Sakoman
2021-10-19 20:06 ` Steve Sakoman [this message]
2021-10-19 20:06 ` [bitbake][dunfell][1.46][PATCH 6/8] bitbake: correct deprecation warning in process.py Steve Sakoman
2021-10-19 20:06 ` [bitbake][dunfell][1.46][PATCH 7/8] test/fetch: Update urls to match upstream branch name changes Steve Sakoman
2021-10-19 20:06 ` [bitbake][dunfell][1.46][PATCH 8/8] hashserv: let asyncio discover the running loop Steve Sakoman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fd6f6c225a0eb1fd2166d93b343d4a5254a16721.1634673786.git.steve@sakoman.com \
--to=steve@sakoman.com \
--cc=bitbake-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).