recipetool: git reformat URI mangling & parameter stripped
recipetool seems to be mangling and stripping out the parameters for git URI. This will fix this issue as well as resolve the conflict of protocol parameter added by user. If a user adds their own protocol as an argument, it'll be honored. [YOCTO #11390] [YOCTO #11391] (From OE-Core rev: e3c832e49a9596537198a46075ed3d6794639953) Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 0cd2fc8ca278ebaa76de95545eef26a07b350c8e) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
182e0a290d
commit
0ffe27ffef
|
@ -26,7 +26,7 @@ import logging
|
||||||
import scriptutils
|
import scriptutils
|
||||||
from urllib.parse import urlparse, urldefrag, urlsplit
|
from urllib.parse import urlparse, urldefrag, urlsplit
|
||||||
import hashlib
|
import hashlib
|
||||||
|
import bb.fetch2
|
||||||
logger = logging.getLogger('recipetool')
|
logger = logging.getLogger('recipetool')
|
||||||
|
|
||||||
tinfoil = None
|
tinfoil = None
|
||||||
|
@ -368,13 +368,30 @@ def reformat_git_uri(uri):
|
||||||
'''Convert any http[s]://....git URI into git://...;protocol=http[s]'''
|
'''Convert any http[s]://....git URI into git://...;protocol=http[s]'''
|
||||||
checkuri = uri.split(';', 1)[0]
|
checkuri = uri.split(';', 1)[0]
|
||||||
if checkuri.endswith('.git') or '/git/' in checkuri or re.match('https?://github.com/[^/]+/[^/]+/?$', checkuri):
|
if checkuri.endswith('.git') or '/git/' in checkuri or re.match('https?://github.com/[^/]+/[^/]+/?$', checkuri):
|
||||||
res = re.match('(http|https|ssh)://([^;]+(\.git)?)(;.*)?$', uri)
|
# Appends scheme if the scheme is missing
|
||||||
if res:
|
if not '://' in uri:
|
||||||
# Need to switch the URI around so that the git fetcher is used
|
uri = 'git://' + uri
|
||||||
return 'git://%s;protocol=%s%s' % (res.group(2), res.group(1), res.group(4) or '')
|
scheme, host, path, user, pswd, parms = bb.fetch2.decodeurl(uri)
|
||||||
elif '@' in checkuri:
|
# Detection mechanism, this is required due to certain URL are formatter with ":" rather than "/"
|
||||||
# Catch e.g. git@git.example.com:repo.git
|
# which causes decodeurl to fail getting the right host and path
|
||||||
return 'git://%s;protocol=ssh' % checkuri.replace(':', '/', 1)
|
if len(host.split(':')) > 1:
|
||||||
|
splitslash = host.split(':')
|
||||||
|
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
|
||||||
|
# finally if protocols or if the url is well-formed, do nothing and rejoin everything back to normal
|
||||||
|
# Need to repackage the arguments for encodeurl, the format is: (scheme, host, path, user, password, OrderedDict([('key', 'value')]))
|
||||||
|
if user:
|
||||||
|
if not 'protocol' in parms:
|
||||||
|
parms.update({('protocol', 'ssh')})
|
||||||
|
elif (scheme == "http" or scheme == 'https' or scheme == 'ssh') and not ('protocol' in parms):
|
||||||
|
parms.update({('protocol', scheme)})
|
||||||
|
# Always append 'git://'
|
||||||
|
fUrl = bb.fetch2.encodeurl(('git', host, path, user, pswd, parms))
|
||||||
|
return fUrl
|
||||||
|
else:
|
||||||
return uri
|
return uri
|
||||||
|
|
||||||
def is_package(url):
|
def is_package(url):
|
||||||
|
|
Loading…
Reference in New Issue