diff options
| author | Nikolai Merinov <n.merinov@inango-systems.com> | 2018-05-13 19:48:49 +0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-21 09:34:40 +0100 |
| commit | 070a06ec53ecb85b238a0eadb12fccabd7303f8b (patch) | |
| tree | 9d2bd383e1b5411814f7b20797b02f4ea4174d65 /bitbake/lib/bb/fetch2/__init__.py | |
| parent | d3139c29e332887d35892a1cbd4f799ed9a62327 (diff) | |
| download | poky-070a06ec53ecb85b238a0eadb12fccabd7303f8b.tar.gz | |
bitbake: fetch2: Use correct check in parameter handling in uri_replace()
If uri_find contain parameters then original URI parameters should
be checked against parameters from uri_find instead of parameters
from uri_replace.
(Bitbake rev: 8efa7826a61501589afa33eb698c0ab3a622bf2e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/__init__.py')
| -rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index c8e2f829c9..a83526a5d0 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
| @@ -452,8 +452,8 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): | |||
| 452 | # Handle URL parameters | 452 | # Handle URL parameters |
| 453 | if i: | 453 | if i: |
| 454 | # Any specified URL parameters must match | 454 | # Any specified URL parameters must match |
| 455 | for k in uri_replace_decoded[loc]: | 455 | for k in uri_find_decoded[loc]: |
| 456 | if uri_decoded[loc][k] != uri_replace_decoded[loc][k]: | 456 | if uri_decoded[loc][k] != uri_find_decoded[loc][k]: |
| 457 | return None | 457 | return None |
| 458 | # Overwrite any specified replacement parameters | 458 | # Overwrite any specified replacement parameters |
| 459 | for k in uri_replace_decoded[loc]: | 459 | for k in uri_replace_decoded[loc]: |