recipetool: create: fix greedy regex that broke support for github tarballs
The regex here needs to be anchored to the end or it'll match longer URLs, which was exactly what I was trying to avoid. This regression was introduced in OE-Core revision 7998dc3597657229507e5c140fceef1e485ac402. Fixes [YOCTO #10023]. (From OE-Core rev: 9291c5d3c257d5ada7605dfe46ababda08f6d3c1) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
be68ef5129
commit
12fbed9e60
|
@ -324,7 +324,7 @@ def supports_srcrev(uri):
|
|||
def reformat_git_uri(uri):
|
||||
'''Convert any http[s]://....git URI into git://...;protocol=http[s]'''
|
||||
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('(https?)://([^;]+(\.git)?)(;.*)?$', uri)
|
||||
if res:
|
||||
# Need to switch the URI around so that the git fetcher is used
|
||||
|
|
Loading…
Reference in New Issue