[OE-core] [morty][PATCH] archiver: Escape recipe name in regex
Joshua Watt
jpewhacker at gmail.com
Tue Jun 27 16:08:08 UTC 2017
On Mon, 2017-06-05 at 21:30 -0500, Joshua Watt wrote:
> From: Joshua Watt <jpewhacker at gmail.com>
>
> The recipe name needs to be escaped when using it in a regular
> expression so
> that and special characters are treated literally
>
> (From OE-Core rev: 53c8cceb744adda1bf899d62071d11b20a5dea98)
>
> 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 3543ca9..188f8c0 100644
> --- a/meta/classes/archiver.bbclass
> +++ b/meta/classes/archiver.bbclass
> @@ -349,8 +349,8 @@ python do_ar_recipe () {
> bbappend_files = d.getVar('BBINCLUDED', True).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)
Ping?
More information about the Openembedded-core
mailing list