summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-07-26 14:57:49 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-01 11:47:10 +0100
commit12fbed9e60c2d351f5fe5ca7b6c214cd19b11e31 (patch)
tree5706f8e7f1443da97b0b891399cdff33994521e1 /scripts
parentbe68ef5129b787978a0e540eb58427b32bd67ce3 (diff)
downloadpoky-12fbed9e60c2d351f5fe5ca7b6c214cd19b11e31.tar.gz
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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/recipetool/create.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 838c23ba9b..a08352ee25 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -324,7 +324,7 @@ def supports_srcrev(uri):
324def reformat_git_uri(uri): 324def reformat_git_uri(uri):
325 '''Convert any http[s]://....git URI into git://...;protocol=http[s]''' 325 '''Convert any http[s]://....git URI into git://...;protocol=http[s]'''
326 checkuri = uri.split(';', 1)[0] 326 checkuri = uri.split(';', 1)[0]
327 if checkuri.endswith('.git') or '/git/' in checkuri or re.match('https?://github.com/[^/]+/[^/]+/?', checkuri): 327 if checkuri.endswith('.git') or '/git/' in checkuri or re.match('https?://github.com/[^/]+/[^/]+/?$', checkuri):
328 res = re.match('(https?)://([^;]+(\.git)?)(;.*)?$', uri) 328 res = re.match('(https?)://([^;]+(\.git)?)(;.*)?$', uri)
329 if res: 329 if res:
330 # Need to switch the URI around so that the git fetcher is used 330 # Need to switch the URI around so that the git fetcher is used