mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: fetch2: Ensure expansions happen in URL parameters in uri_replace

Browse Source 
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:
Richard Purdie
2013-02-14 21:36:30 +00:00
parent 423dd2f7cd
commit d5ef2e5cc0
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/fetch2/__init__.py
+2
View File
@@ -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]: