[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6072/8267] archiver: Escape recipe name in regex



commit 1a4494b2e6953bf30fcb03045874f5ed8bd62c81
Author: Joshua Watt <jpewhacker gmail com>
Date:   Wed May 31 07:42:37 2017 -0500

    archiver: Escape recipe name in regex
    
    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 gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/archiver.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index aa74146..37a21fe 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -378,8 +378,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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]