<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<p>Hello,</p>
<p>Any review on this?</p>
<p>Regards,<br>
Nikolai<br>
</p>
<div class="moz-cite-prefix">On 5/13/18 7:48 PM, Nikolai Merinov
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:20180513144849.6526-1-n.merinov@inango-systems.com">
<pre class="moz-quote-pre" wrap="">If uri_find contain parameters then original URI parameters should
be checked against parameters from uri_find instead of parameters
from uri_replace.
---
lib/bb/fetch2/__init__.py | 4 ++--
lib/bb/tests/fetch.py | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 72d6092d..829f1903 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 74859f9d..66a9ddb5 100644
--- a/lib/bb/tests/fetch.py
+++ b/lib/bb/tests/fetch.py
@@ -402,6 +402,8 @@ class MirrorUriTest(FetcherTest):
: "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http",
("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "git://somewhere.org/somedir/MIRRORNAME;protocol=http")
: "git://somewhere.org/somedir/git.invalid.infradead.org.foo.mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http",
+ ("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
#(<a class="moz-txt-link-rfc2396E" href="http://somewhere.org/somedir1/somefile_1.2.3.tar.gz">"http://somewhere.org/somedir1/somefile_1.2.3.tar.gz"</a>, <a class="moz-txt-link-rfc2396E" href="http://somewhere.org/somedir1/somefile_1.2.3.tar.gz">"http://somewhere.org/somedir1/somefile_1.2.3.tar.gz"</a>, <a class="moz-txt-link-rfc2396E" href="http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz">"http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz"</a>) : <a class="moz-txt-link-rfc2396E" href="http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz">"http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz"</a>
</pre>
</blockquote>
<div class="moz-signature">-- <br>
<div style="margin-bottom: 7px; font-family: sans-serif;"> <a
href="http://inango.com"> <img
src="cid:part1.F39CC919.5FB96E25@inango-systems.com"> </a>
</div>
<div style="color: #333333; padding-left:13px; font-family:
sans-serif; font-size: 13px; line-height: 14px; ">
<div style="font-weight: bold;">Nikolai Merinov</div>
<div>Team Leader, 3rd Party Group</div>
<div style="font-size: 11px;"><a class="moz-txt-link-abbreviated" href="mailto:n.merinov@inango-systems.com">n.merinov@inango-systems.com</a></div>
<div style="font-size: 11px; line-height: 15px;
padding-left:5px">T +7 343 298 0147 C +7 912 229 2564</div>
</div>
<div style="margin-left: 13px; font-family: sans-serif; font-size:
11px; line-height: 14px;">
<span><a href="http://inango.com" style="text-decoration: none;
color: #F48B00; font-weight: bold; margin-right: 5px;">inango.com</a></span><a
href="https://www.linkedin.com/company/inango"><img
src="cid:part4.FC4E8D4B.C61D8B2A@inango-systems.com"
alt="Inango on LinkedIn" style="vertical-align: top;"></a>
</div>
</div>
</body>
</html>