aboutsummaryrefslogtreecommitdiffstats
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-19 17:09:10 +0100
commit8efa7826a61501589afa33eb698c0ab3a622bf2e (patch)
tree189128595c8200189739225eab93994c837d6e82
parent4937ed392fdc4442dd91f644f329dda29f27242c (diff)
downloadbitbake-8efa7826a61501589afa33eb698c0ab3a622bf2e.tar.gz
bitbake-8efa7826a61501589afa33eb698c0ab3a622bf2e.tar.bz2
bitbake-8efa7826a61501589afa33eb698c0ab3a622bf2e.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/fetch2/__init__.py4
-rw-r--r--lib/bb/tests/fetch.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index c8e2f829..a83526a5 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -452,8 +452,8 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None):
# Handle URL parameters
if i:
# Any specified URL parameters must match
- for k in uri_replace_decoded[loc]:
- if uri_decoded[loc][k] != uri_replace_decoded[loc][k]:
+ for k in uri_find_decoded[loc]:
+ if uri_decoded[loc][k] != uri_find_decoded[loc][k]:
return None
# Overwrite any specified replacement parameters
for k in uri_replace_decoded[loc]:
diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py
index 1821ee81..4af0ac55 100644
--- a/lib/bb/tests/fetch.py
+++ b/lib/bb/tests/fetch.py
@@ -406,6 +406,8 @@ class MirrorUriTest(FetcherTest):
: "http://somewhere2.org/somefile_1.2.3.tar.gz",
("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/")
: "http://somewhere2.org/somefile_1.2.3.tar.gz",
+ ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master", "git://someserver.org/bitbake;branch=master", "git://git.openembedded.org/bitbake;protocol=http")
+ : "git://git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master;protocol=http",
#Renaming files doesn't work
#("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"