summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 05ecd3c343..06be82da2a 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -194,7 +194,15 @@ def uri_replace(ud, uri_find, uri_replace, d):
194 for loc, i in enumerate(uri_find_decoded): 194 for loc, i in enumerate(uri_find_decoded):
195 result_decoded[loc] = uri_decoded[loc] 195 result_decoded[loc] = uri_decoded[loc]
196 if loc == 5: 196 if loc == 5:
197 continue 197 # Handle URL parameters
198 if i:
199 # Any specified URL parameters must match
200 for k in uri_replace_decoded[loc]:
201 if uri_decoded[loc][k] != uri_replace_decoded[loc][k]:
202 return None
203 # Overwrite any specified replacement parameters
204 for k in uri_replace_decoded[loc]:
205 result_decoded[loc][k] = uri_replace_decoded[loc][k]
198 elif (re.match(i, uri_decoded[loc])): 206 elif (re.match(i, uri_decoded[loc])):
199 if not uri_replace_decoded[loc]: 207 if not uri_replace_decoded[loc]:
200 result_decoded[loc] = "" 208 result_decoded[loc] = ""