summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorNikolai Merinov <n.merinov@inango-systems.com>2018-05-13 19:48:49 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-21 09:34:40 +0100
commit070a06ec53ecb85b238a0eadb12fccabd7303f8b (patch)
tree9d2bd383e1b5411814f7b20797b02f4ea4174d65 /bitbake/lib/bb
parentd3139c29e332887d35892a1cbd4f799ed9a62327 (diff)
downloadpoky-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')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py4
-rw-r--r--bitbake/lib/bb/tests/fetch.py2
2 files changed, 4 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]:
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index 1821ee81c0..4af0ac550c 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -406,6 +406,8 @@ class MirrorUriTest(FetcherTest):
406 : "http://somewhere2.org/somefile_1.2.3.tar.gz", 406 : "http://somewhere2.org/somefile_1.2.3.tar.gz",
407 ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/") 407 ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/")
408 : "http://somewhere2.org/somefile_1.2.3.tar.gz", 408 : "http://somewhere2.org/somefile_1.2.3.tar.gz",
409 ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master", "git://someserver.org/bitbake;branch=master", "git://git.openembedded.org/bitbake;protocol=http")
410 : "git://git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master;protocol=http",
409 411
410 #Renaming files doesn't work 412 #Renaming files doesn't work
411 #("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz" 413 #("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz"