From 1c240f920907518c8982d3164205fa13e6c04f84 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 4 Aug 2021 16:24:18 +0200 Subject: convert-overrides.py: allow dots before override in vars_re and shortvars_re e.g. VIRTUAL-RUNTIME_com.webos.service.flowmanager_armv4 weren't replaced with VIRTUAL-RUNTIME_com.webos.service.flowmanager:armv4 or when package name contains a dot like in: RDEPENDS:gstreamer1.0-meta-base:remove (From OE-Core rev: 41bff44bd26c09573eb3139bb6735e5ecfda18b7) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- scripts/contrib/convert-overrides.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/contrib') diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py index 8cdcf208bc..e4a310d1d6 100755 --- a/scripts/contrib/convert-overrides.py +++ b/scripts/contrib/convert-overrides.py @@ -69,11 +69,11 @@ packagevars = packagevars + imagevars vars_re = {} for exp in vars: - vars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}]+)_' + exp), r"\1:" + exp) + vars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp), r"\1:" + exp) shortvars_re = {} for exp in shortvars: - shortvars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}]+)_' + exp + '([\(\'"\s:])'), r"\1:" + exp + r"\3") + shortvars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp + '([\(\'"\s:])'), r"\1:" + exp + r"\3") package_re = {} for exp in packagevars: @@ -122,7 +122,7 @@ def processfile(fn): pass ourname = os.path.basename(sys.argv[0]) -ourversion = "0.9.2" +ourversion = "0.9.3" if os.path.isfile(sys.argv[1]): processfile(sys.argv[1]) -- cgit v1.2.3-54-g00ecf