diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-07-26 14:57:49 +1200 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-10-19 11:10:54 +1300 |
| commit | 2e9ab6fce279d3f51bcdf62aa40470b7989defb4 (patch) | |
| tree | a0c8747723ca16ee0ef1b1555bd46edf78cad98f | |
| parent | cddb8a6f91329741483ba3988b985bc774bbee16 (diff) | |
| download | openembedded-core-contrib-2e9ab6fce279d3f51bcdf62aa40470b7989defb4.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>
| -rw-r--r-- | scripts/lib/recipetool/create.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 9340c4fb5a..1f85fcf9d5 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 |