summaryrefslogtreecommitdiffstats
path: root/scripts/contrib
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2021-11-11 17:57:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-11 17:09:17 +0000
commit0a0052e4563e3e387738ea485d4eae83d37e2ece (patch)
tree3c69c223ba9807f9dac271041402861294b8bba0 /scripts/contrib
parentfb4406073ede27711c8e6b7a25c0a2bcb4d17c3c (diff)
downloadpoky-0a0052e4563e3e387738ea485d4eae83d37e2ece.tar.gz
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: a69a53573b1987ee5834a6fc27763f9bbf5fe5a4) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib')
-rwxr-xr-xscripts/contrib/convert-srcuri.py8
1 files 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):
35 if ("git://" in line or "gitsm://" in line) and "branch=" not in line and matchline(line): 35 if ("git://" in line or "gitsm://" in line) and "branch=" not in line and matchline(line):
36 if line.endswith('"\n'): 36 if line.endswith('"\n'):
37 line = line.replace('"\n', ';branch=master"\n') 37 line = line.replace('"\n', ';branch=master"\n')
38 elif line.endswith(" \\\n"): 38 elif re.search('\s*\\\\$', line):
39 line = line.replace(' \\\n', ';branch=master \\\n') 39 line = re.sub('\s*\\\\$', ';branch=master \\\\', line)
40 modified = True 40 modified = True
41 if ("git://" in line or "gitsm://" in line) and "github.com" in line and "protocol=https" not in line and matchline(line): 41 if ("git://" in line or "gitsm://" in line) and "github.com" in line and "protocol=https" not in line and matchline(line):
42 if "protocol=git" in line: 42 if "protocol=git" in line:
43 line = line.replace('protocol=git', 'protocol=https') 43 line = line.replace('protocol=git', 'protocol=https')
44 elif line.endswith('"\n'): 44 elif line.endswith('"\n'):
45 line = line.replace('"\n', ';protocol=https"\n') 45 line = line.replace('"\n', ';protocol=https"\n')
46 elif line.endswith(" \\\n"): 46 elif re.search('\s*\\\\$', line):
47 line = line.replace(' \\\n', ';protocol=https \\\n') 47 line = re.sub('\s*\\\\$', ';protocol=https \\\\', line)
48 modified = True 48 modified = True
49 new_file.write(line) 49 new_file.write(line)
50 if modified: 50 if modified: