From 7884e05de96a4be27fbc98da8725d285064b16de Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Thu, 11 Nov 2021 17:57:24 +0800 Subject: convert-srcuri.py: use regex to check space in SRC_URI There may be none, one or more spaces including tab before backslash in SRC_URI. Use regex to check and update. It helps to avoid malformed uri such as recipe open-iscsi-user in meta-openstack: SRC_URI = "git://github.com/open-iscsi/open-iscsi.git;protocol=https ;branch=master \ And help to check more recipes such as concurrent-ruby in the same layer: SRC_URI = "git://github.com/ruby-concurrency/concurrent-ruby.git;protocol=https;tag=v1.1.6\ (From OE-Core rev: f87a3aba3086cd3fd89274337f25fc1717d6c981) Signed-off-by: Kai Kang Signed-off-by: Richard Purdie (cherry picked from commit a69a53573b1987ee5834a6fc27763f9bbf5fe5a4) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- scripts/contrib/convert-srcuri.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/contrib/convert-srcuri.py b/scripts/contrib/convert-srcuri.py index 5b362ea2e8..587392334f 100755 --- a/scripts/contrib/convert-srcuri.py +++ b/scripts/contrib/convert-srcuri.py @@ -35,16 +35,16 @@ def processfile(fn): if ("git://" in line or "gitsm://" in line) and "branch=" not in line and matchline(line): if line.endswith('"\n'): line = line.replace('"\n', ';branch=master"\n') - elif line.endswith(" \\\n"): - line = line.replace(' \\\n', ';branch=master \\\n') + elif re.search('\s*\\\\$', line): + line = re.sub('\s*\\\\$', ';branch=master \\\\', line) modified = True if ("git://" in line or "gitsm://" in line) and "github.com" in line and "protocol=https" not in line and matchline(line): if "protocol=git" in line: line = line.replace('protocol=git', 'protocol=https') elif line.endswith('"\n'): line = line.replace('"\n', ';protocol=https"\n') - elif line.endswith(" \\\n"): - line = line.replace(' \\\n', ';protocol=https \\\n') + elif re.search('\s*\\\\$', line): + line = re.sub('\s*\\\\$', ';protocol=https \\\\', line) modified = True new_file.write(line) if modified: -- cgit v1.2.3-54-g00ecf