summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-03 18:19:23 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-03 18:19:23 +0000
commit7f99605562119a13a2510a3c990e3cf577ad764e (patch)
treed6f10f4d93adf7858b3c68ca8486b885950218f1 /bitbake/lib/bb/fetch2
parent9ee3c77f4e23081e8fa30f66afec4330b8d07562 (diff)
downloadopenembedded-core-7f99605562119a13a2510a3c990e3cf577ad764e.tar.gz
openembedded-core-7f99605562119a13a2510a3c990e3cf577ad764e.tar.bz2
openembedded-core-7f99605562119a13a2510a3c990e3cf577ad764e.tar.xz
openembedded-core-7f99605562119a13a2510a3c990e3cf577ad764e.zip
bitbake/fetch2: When encoding a file:// url, drop user and host information
When processing a cvs SRC_URI to a file:// mirror, the user and host information will break the mirror processing. This patch addresses it by only constructing valid urls. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 11a813e02..43ba772db 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -108,12 +108,12 @@ def encodeurl(decoded):
if not type or not path:
raise MissingParameterError("Type or path url components missing when encoding %s" % decoded)
url = '%s://' % type
- if user:
+ if user and type != "file":
url += "%s" % user
if pswd:
url += ":%s" % pswd
url += "@"
- if host:
+ if host and type != "file":
url += "%s" % host
url += "%s" % path
if p: