From d5ef2e5cc04bea534dd132b5fd40efe78ddcfc4f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 14 Feb 2013 21:36:30 +0000 Subject: 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 --- bitbake/lib/bb/fetch2/__init__.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'bitbake') 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]: -- cgit v1.2.3-54-g00ecf