archiver: Escape recipe name in regex

PATCH Superseded Joshua Watt 1 participant 1 message May 31, 2017

Share & tools

Joshua Watt

author

2017-05-31 12:42 UTC #0 lore raw

PATCH 1/1 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

Signed-off-by Joshua Watt <[email protected]>

---
 meta/classes/archiver.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

meta/classes/archiver.bbclass +2 -2

index 2c04557..9cc9fb5 100644
@@ -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)

Signature · 1 line

2.9.4