From patchwork Thu Feb 14 21:36:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel] fetch2: Ensure expansions happen in URL parameters in uri_replace Date: Thu, 14 Feb 2013 21:36:30 -0000 From: Richard Purdie X-Patchwork-Id: 44665 Message-Id: <1360877790.11225.125.camel@ted> To: bitbake-devel 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 --- diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 21f576e..3f5de99 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]: