summaryrefslogtreecommitdiffstats
path: root/bitbake
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
parent9ee3c77f4e23081e8fa30f66afec4330b8d07562 (diff)
downloadpoky-7f99605562119a13a2510a3c990e3cf577ad764e.tar.gz
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')
-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 11a813e028..43ba772dbf 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -108,12 +108,12 @@ def encodeurl(decoded):
108 if not type or not path: 108 if not type or not path:
109 raise MissingParameterError("Type or path url components missing when encoding %s" % decoded) 109 raise MissingParameterError("Type or path url components missing when encoding %s" % decoded)
110 url = '%s://' % type 110 url = '%s://' % type
111 if user: 111 if user and type != "file":
112 url += "%s" % user 112 url += "%s" % user
113 if pswd: 113 if pswd:
114 url += ":%s" % pswd 114 url += ":%s" % pswd
115 url += "@" 115 url += "@"
116 if host: 116 if host and type != "file":
117 url += "%s" % host 117 url += "%s" % host
118 url += "%s" % path 118 url += "%s" % path
119 if p: 119 if p: