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/tests | |
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/tests')
-rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 2 |
1 files changed, 2 insertions, 0 deletions
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" |