[oe-commits] [openembedded-core] 08/37: recipetool: create: fix greedy regex that broke support for github tarballs

[git at git.openembedded.org]

rpurdie pushed a commit to branch krogoth
in repository openembedded-core.

commit 9e5886036fd77454dff1cb359c2c6cebca60ecbe
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Tue Jul 26 14:57:49 2016 +1200

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 scripts/lib/recipetool/create.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 9340c4f..1f85fcf 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -320,7 +320,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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.