diff options
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 88905f9b4b..1b99a0fe49 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -203,6 +203,12 @@ def uri_replace(ud, uri_find, uri_replace, d): | |||
203 | # Overwrite any specified replacement parameters | 203 | # Overwrite any specified replacement parameters |
204 | for k in uri_replace_decoded[loc]: | 204 | for k in uri_replace_decoded[loc]: |
205 | result_decoded[loc][k] = uri_replace_decoded[loc][k] | 205 | result_decoded[loc][k] = uri_replace_decoded[loc][k] |
206 | elif loc == 0: | ||
207 | # Principle of least surprise. We could end up with https matching against http and | ||
208 | # generating "files://" urls if we use the regexp engine below. | ||
209 | if i != uri_decoded[loc]: | ||
210 | return None | ||
211 | result_decoded[loc] = uri_replace_decoded[loc] | ||
206 | elif (re.match(i, uri_decoded[loc])): | 212 | elif (re.match(i, uri_decoded[loc])): |
207 | if not uri_replace_decoded[loc]: | 213 | if not uri_replace_decoded[loc]: |
208 | result_decoded[loc] = "" | 214 | result_decoded[loc] = "" |