Skip to contentSkip to conversation

convert-overrides.py: allow dots before override in vars_re and shortvars_re

PATCH New Martin Jansa 1 participant 1 message Aug 4, 2021

lore
Share & tools
lore
#0 lore raw

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

---
 scripts/contrib/convert-overrides.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
scripts/contrib/convert-overrides.py +3 -3
index 1f395deeeb..97debb6298 100755
@@ -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])
Signature · 1 line
2.30.2