summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-06-03 21:50:02 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-07 16:05:00 +0100
commitc3682bf89bdf236a4b4d834069d947b6a1456791 (patch)
treefa8e6715c6176faeb4a0740d29b2c5faabf240d3
parent807e983632088ee8cb8eb51b432aef3cab7dbbd7 (diff)
downloadopenembedded-core-c3682bf89bdf236a4b4d834069d947b6a1456791.tar.gz
openembedded-core-c3682bf89bdf236a4b4d834069d947b6a1456791.tar.bz2
openembedded-core-c3682bf89bdf236a4b4d834069d947b6a1456791.zip
bitbake decodeurl: fix the file:// url handling
Without this patch decoding a url of this kind file://dir/filename gives path=/filename host=dir. With the patch it decodes as path=/dir/filename host="" Probably nobody stumbled on this issue yet because nobody used file:// urls with directory names in the path. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--bitbake/lib/bb/fetch/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index e6cc1c535b..b566da4311 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -57,6 +57,9 @@ def decodeurl(url):
>>> decodeurl("http://www.google.com/index.html")
('http', 'www.google.com', '/index.html', '', '', {})
+ >>> decodeurl("file://gas/COPYING")
+ ('file', '', 'gas/COPYING', '', '', {})
+
CVS url with username, host and cvsroot. The cvs module to check out is in the
parameters:
@@ -82,7 +85,7 @@ def decodeurl(url):
parm = m.group('parm')
locidx = location.find('/')
- if locidx != -1:
+ if locidx != -1 and type.lower() != 'file':
host = location[:locidx]
path = location[locidx:]
else: