summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 21:36:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-15 12:12:36 +0000
commitd5ef2e5cc04bea534dd132b5fd40efe78ddcfc4f (patch)
tree7232d1fe0b78473e159f26798e8d35af7723daaa /bitbake
parent423dd2f7cdcb5181ec1e7029ee700e1685c38483 (diff)
downloadpoky-d5ef2e5cc04bea534dd132b5fd40efe78ddcfc4f.tar.gz
poky-d5ef2e5cc04bea534dd132b5fd40efe78ddcfc4f.tar.bz2
poky-d5ef2e5cc04bea534dd132b5fd40efe78ddcfc4f.zip
bitbake: fetch2: Ensure expansions happen in URL parameters in uri_replace
For example, this allows us to specify downloadfilename=PATH in sstate mirror urls to improve directory structures in DL_DIR when using sstate. (Bitbake rev: 7850a1364b6b37c58664d84f9c14806b4479b45c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 21f576eebc..3f5de990de 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -214,6 +214,8 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d):
return None
# Overwrite any specified replacement parameters
for k in uri_replace_decoded[loc]:
+ for l in replacements:
+ uri_replace_decoded[loc][k] = uri_replace_decoded[loc][k].replace(l, replacements[l])
result_decoded[loc][k] = uri_replace_decoded[loc][k]
elif (re.match(regexp, uri_decoded[loc])):
if not uri_replace_decoded[loc]: