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>
This commit is contained in:
parent
423dd2f7cd
commit
d5ef2e5cc0
|
@ -214,6 +214,8 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d):
|
||||||
return None
|
return None
|
||||||
# Overwrite any specified replacement parameters
|
# Overwrite any specified replacement parameters
|
||||||
for k in uri_replace_decoded[loc]:
|
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]
|
result_decoded[loc][k] = uri_replace_decoded[loc][k]
|
||||||
elif (re.match(regexp, uri_decoded[loc])):
|
elif (re.match(regexp, uri_decoded[loc])):
|
||||||
if not uri_replace_decoded[loc]:
|
if not uri_replace_decoded[loc]:
|
||||||
|
|
Loading…
Reference in New Issue