[1/2] contrib: allow override-style syntax for vars & routines

Message ID 23442f7ad508ed66ef43adff0c32a45b07d6fc6f.1639709734.git.jk@codeconstruct.com.au
State New
Headers show
Series [1/2] contrib: allow override-style syntax for vars & routines | expand

Commit Message

Jeremy Kerr Dec. 17, 2021, 2:59 a.m. UTC
Currently, the variable and routine regexes don't support the
override-style syntax. This means we may break routine blocks, as we
don't recognise overridden routines with an :append/:prepend/etc.

This change adds the ":" char to the var & routine regexes.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
---
 contrib/oe-stylize.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py
index e1ba1b321..67c06b1bb 100755
--- a/contrib/oe-stylize.py
+++ b/contrib/oe-stylize.py
@@ -210,8 +210,8 @@  OE_vars = [
     'others'
 ]
 
-varRegexp = r'^([a-zA-Z_0-9${}-]*)([ \t]*)([+.:]?=[+.]?)([ \t]*)([^\t]+)'
-routineRegexp = r'^([a-zA-Z0-9_ ${}-]+?)\('
+varRegexp = r'^([a-zA-Z_0-9${}:-]*)([ \t]*)([+.:]?=[+.]?)([ \t]*)([^\t]+)'
+routineRegexp = r'^([a-zA-Z0-9_ ${}:-]+?)\('
 
 # Variables seen in the processed .bb
 seen_vars = {}