[OE-core] [PATCH v2] archiver: Escape recipe name in regex
Joshua Watt
jpewhacker at gmail.com
Sun Jun 4 21:37:09 UTC 2017
On Wed, May 31, 2017 at 8:33 PM, Joshua Watt <jpewhacker at gmail.com> wrote:
> The recipe name needs to be escaped when it is used in a regular expression so
> that any special characters are treated literally
>
> Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
> ---
> meta/classes/archiver.bbclass | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
> index 2c04557..9cc9fb5 100644
> --- a/meta/classes/archiver.bbclass
> +++ b/meta/classes/archiver.bbclass
> @@ -349,8 +349,8 @@ python do_ar_recipe () {
> bbappend_files = d.getVar('BBINCLUDED').split()
> # If recipe name is aa, we need to match files like aa.bbappend and aa_1.1.bbappend
> # Files like aa1.bbappend or aa1_1.1.bbappend must be excluded.
> - bbappend_re = re.compile( r".*/%s_[^/]*\.bbappend$" %pn)
> - bbappend_re1 = re.compile( r".*/%s\.bbappend$" %pn)
> + bbappend_re = re.compile( r".*/%s_[^/]*\.bbappend$" % re.escape(pn))
> + bbappend_re1 = re.compile( r".*/%s\.bbappend$" % re.escape(pn))
> for file in bbappend_files:
> if bbappend_re.match(file) or bbappend_re1.match(file):
> shutil.copy(file, outdir)
> --
> 2.9.4
>
Would it be possible to get this backported to pyro and morty? If
there is something else I need to move that along, please let me know.
Thanks,
Joshua Watt
More information about the Openembedded-core
mailing list