diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-14 21:36:30 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-15 12:00:53 +0000 |
| commit | 7850a1364b6b37c58664d84f9c14806b4479b45c (patch) | |
| tree | d93b9199c1a8fa53489c4b67d8001c0068b0215f /lib | |
| parent | 54dce9e14ab0657d76f0d0ae22eef7fab8e8950d (diff) | |
| download | bitbake-7850a1364b6b37c58664d84f9c14806b4479b45c.tar.gz | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/fetch2/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 21f576eeb..3f5de990d 100644 --- a/lib/bb/fetch2/__init__.py +++ b/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]: |