summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-01-19 00:18:30 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-19 17:24:51 +0000
commit788e4bb23ef6a167a95c4f870721ea05bcbe376c (patch)
tree3af0d6b14a0d261e3dd4cc89b52039ad4326e4cc /scripts
parentece0a2e1a03b03c3280027f13fe3345cd05f9058 (diff)
downloadpoky-788e4bb23ef6a167a95c4f870721ea05bcbe376c.tar.gz
recipetool: create: fix overzealous mapping of git URLs
The regex for detecting git URLs was unanchored, leading to it matching where it shouldn't have. An example of where this went wrong was http://taglib.github.io/releases/taglib-1.9.1.tar.gz. (From OE-Core rev: bacff751c88b680fbfb07843b18c59c8bc80a9ea) Signed-off-by: Paul Eggleton <paul.eggleton@linux.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 4f95d7e3ae..1218a7d284 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -140,7 +140,7 @@ def create_recipe(args):
140 # Assume the archive contains the directory structure verbatim 140 # Assume the archive contains the directory structure verbatim
141 # so we need to extract to a subdirectory 141 # so we need to extract to a subdirectory
142 fetchuri += ';subdir=%s' % os.path.splitext(os.path.basename(urlparse.urlsplit(fetchuri).path))[0] 142 fetchuri += ';subdir=%s' % os.path.splitext(os.path.basename(urlparse.urlsplit(fetchuri).path))[0]
143 git_re = re.compile('(https?)://([^;]+\.git)(;.*)?') 143 git_re = re.compile('(https?)://([^;]+\.git)(;.*)?$')
144 res = git_re.match(fetchuri) 144 res = git_re.match(fetchuri)
145 if res: 145 if res:
146 # Need to switch the URI around so that the git fetcher is used 146 # Need to switch the URI around so that the git fetcher is used