summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-07-26 12:02:59 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-07-26 14:55:25 +1200
commit126ef126a5a8c35225d0d7c4f07328fcf83a4f4d (patch)
treefe71ce937dc08027179c260f2d58e6e9956d2209
parent0a2df616a5c3316704742f1dcf37b450920e0280 (diff)
downloadopenembedded-core-contrib-126ef126a5a8c35225d0d7c4f07328fcf83a4f4d.tar.gz
openembedded-core-contrib-126ef126a5a8c35225d0d7c4f07328fcf83a4f4d.tar.bz2
openembedded-core-contrib-126ef126a5a8c35225d0d7c4f07328fcf83a4f4d.zip
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]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-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 f246028a02..8c399b3ae2 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -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