From: "Chen Qi" <Qi.Chen@windriver.com>
To: Martin Jansa <martin.jansa@gmail.com>
Cc: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core][PATCH 1/2] convert-overrides.py: also convert comments without a leading whitespace
Date: Fri, 6 Aug 2021 17:44:05 +0800 [thread overview]
Message-ID: <337b6850-712e-e2e8-23ce-d7e8e61955db@windriver.com> (raw)
In-Reply-To: <CA+chaQdFS4pb7QOsdd3Rwqi7Qva9z-Wh7EAd=g7+96=fd1C_wQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2896 bytes --]
Got it. I've sent out V2.
Regards,
Qi
On 08/06/2021 05:25 PM, Martin Jansa wrote:
> Can you please bump the script version as well?
>
> On Fri, Aug 6, 2021 at 11:03 AM Chen Qi <Qi.Chen@windriver.com
> <mailto:Qi.Chen@windriver.com>> wrote:
>
> Currently lines like below are converted.
> e.g.
> # IMAGE_INSTALL_append = " A"
>
> But lines without a leading whitespace are not converted.
> e.g.
> #IMAGE_INSTALL_append = " A"
>
> We should be converting both.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com
> <mailto:Qi.Chen@windriver.com>>
> ---
> scripts/contrib/convert-overrides.py
> <https://urldefense.com/v3/__http://convert-overrides.py__;%21%21AjveYdw8EvQ%21PD0spdg2c_3A47Id6ecejSLJcClzE1tewbyquzswai_YYcg_XxOQyX2l9AH3cc9f2A$>
> | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/contrib/convert-overrides.py
> <https://urldefense.com/v3/__http://convert-overrides.py__;%21%21AjveYdw8EvQ%21PD0spdg2c_3A47Id6ecejSLJcClzE1tewbyquzswai_YYcg_XxOQyX2l9AH3cc9f2A$>
> b/scripts/contrib/convert-overrides.py
> <https://urldefense.com/v3/__http://convert-overrides.py__;%21%21AjveYdw8EvQ%21PD0spdg2c_3A47Id6ecejSLJcClzE1tewbyquzswai_YYcg_XxOQyX2l9AH3cc9f2A$>
> index e4a310d1d6..4d41a4c475 100755
> --- a/scripts/contrib/convert-overrides.py
> <https://urldefense.com/v3/__http://convert-overrides.py__;%21%21AjveYdw8EvQ%21PD0spdg2c_3A47Id6ecejSLJcClzE1tewbyquzswai_YYcg_XxOQyX2l9AH3cc9f2A$>
> +++ b/scripts/contrib/convert-overrides.py
> <https://urldefense.com/v3/__http://convert-overrides.py__;%21%21AjveYdw8EvQ%21PD0spdg2c_3A47Id6ecejSLJcClzE1tewbyquzswai_YYcg_XxOQyX2l9AH3cc9f2A$>
> @@ -69,15 +69,15 @@ packagevars = packagevars + imagevars
>
> vars_re = {}
> for exp in vars:
> - vars_re[exp] =
> (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp),
> r"\1:" + exp)
> + vars_re[exp] =
> (re.compile('((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp),
> r"\1:" + exp)
>
> shortvars_re = {}
> for exp in shortvars:
> - shortvars_re[exp] =
> (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp +
> '([\(\'"\s:])'), r"\1:" + exp + r"\3")
> + shortvars_re[exp] =
> (re.compile('((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp +
> '([\(\'"\s:])'), r"\1:" + exp + r"\3")
>
> package_re = {}
> for exp in packagevars:
> - package_re[exp] = (re.compile('(^|[\'"\s\-\+]+)' + exp + '_'
> + '([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2")
> + package_re[exp] = (re.compile('(^|[#\'"\s\-\+]+)' + exp + '_'
> + '([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2")
>
> # Other substitutions to make
> subs = {
> --
> 2.30.2
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 4620 bytes --]
prev parent reply other threads:[~2021-08-06 9:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-06 9:03 [OE-core][PATCH 1/2] convert-overrides.py: also convert comments without a leading whitespace Chen Qi
2021-08-06 9:03 ` [OE-core][PATCH 2/2] convert-overrides.py: skip patches Chen Qi
2021-08-06 10:58 ` Richard Purdie
2021-08-09 1:36 ` Chen Qi
2021-08-06 9:25 ` [OE-core][PATCH 1/2] convert-overrides.py: also convert comments without a leading whitespace Martin Jansa
2021-08-06 9:44 ` Chen Qi [this message]
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=337b6850-712e-e2e8-23ce-d7e8e61955db@windriver.com \
--to=qi.chen@windriver.com \
--cc=martin.jansa@gmail.com \
--cc=openembedded-core@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