summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2018-04-01 23:15:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-03 10:57:50 +0100
commit4290e04b69360b5e1da9f37166015e30f66cb335 (patch)
tree4148d19eec97af24fe649ac96c8595060190d09c /scripts
parentae230e1f858f83d1ff063554b49bd3ee1f880f76 (diff)
downloadopenembedded-core-contrib-4290e04b69360b5e1da9f37166015e30f66cb335.tar.gz
openembedded-core-contrib-4290e04b69360b5e1da9f37166015e30f66cb335.tar.bz2
openembedded-core-contrib-4290e04b69360b5e1da9f37166015e30f66cb335.zip
recipetool: create: fix port number parsing issue
A flaw was found when I run: $ recipetool create "ssh://git@xxx.xxx:7999/xxx.git" the url turned out to be: "git://git@xxx.xxx/7999/xxx.git;protocol=ssh" after parsing, the port number was parsed as part of the path, this is definitely wrong and lead to fetching failures. This issue could be fixed in reformat_git_uri, by filtering out port numbers when formatting ":". Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/recipetool/create.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 2fc9e0aa4e..a3710285bb 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -383,8 +383,10 @@ def reformat_git_uri(uri):
# which causes decodeurl to fail getting the right host and path
if len(host.split(':')) > 1:
splitslash = host.split(':')
- host = splitslash[0]
- path = '/' + splitslash[1] + path
+ # Port number should not be split from host
+ if not re.match('^[0-9]+$', splitslash[1]):
+ host = splitslash[0]
+ path = '/' + splitslash[1] + path
#Algorithm:
# if user is defined, append protocol=ssh or if a protocol is defined, then honor the user-defined protocol
# if no user & password is defined, check for scheme type and append the protocol with the scheme type