* Re: [bitbake-devel] [PATCH v2] fetch2: make sure the uri added as expected
[not found] ` <1682DA98929F43DA.30286@lists.openembedded.org>
@ 2021-06-02 2:24 ` Yu, Mingli
2021-06-10 1:37 ` Yu, Mingli
1 sibling, 0 replies; 3+ messages in thread
From: Yu, Mingli @ 2021-06-02 2:24 UTC (permalink / raw)
To: bitbake-devel, richard.purdie
Any comments?
Thanks,
On 5/27/21 3:04 PM, Yu, Mingli wrote:
> From: Mingli Yu <mingli.yu@windriver.com>
>
> When call uri_replace to get the new uris, we should guarantee the
> new uri is added when the replace uri begins with file if the find
> uri begin with wildcard which mapped as below.
> PREMIRRORS_append = " \
> .*://.*/.* git://somewhere.org/somedir/MIRRORNAME;protocol=http \n \
> " | |
> | |
> | |
> find replace
>
> Before the patch:
> the original uri
> gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https
>
> PREMIRRORS_append = " \
> .*://.*/.* git://somewhere.org/somedir/MIRRORNAME;protocol=http \n \
> "
> The new uri is git://somewhere.org/somedir/github.com.tianocore.edk2.git/git2_github.com.tianocore.edk2.git.tar.gz;protocol=http
>
> After the patch:
> the original uri
> gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https
>
> PREMIRRORS_append = " \
> .*://.*/.* git://somewhere.org/somedir/MIRRORNAME;protocol=http \n \
> "
> The new uri is None as the find begins with wildcard but the replace
> doesn't begin with file.
>
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
> lib/bb/fetch2/__init__.py | 2 ++
> lib/bb/tests/fetch.py | 8 +++++++-
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
> index cf0201c4..6701654b 100644
> --- a/lib/bb/fetch2/__init__.py
> +++ b/lib/bb/fetch2/__init__.py
> @@ -430,6 +430,8 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None):
> uri_replace_decoded = list(decodeurl(uri_replace))
> logger.debug2("For url %s comparing %s to %s" % (uri_decoded, uri_find_decoded, uri_replace_decoded))
> result_decoded = ['', '', '', '', '', {}]
> + if uri_find_decoded[0] == '.*' and uri_replace_decoded[0] != 'file':
> + uri_find_decoded[0] = uri_replace_decoded[0]
> for loc, i in enumerate(uri_find_decoded):
> result_decoded[loc] = uri_decoded[loc]
> regexp = i
> diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py
> index 9291ce4a..85a14301 100644
> --- a/lib/bb/tests/fetch.py
> +++ b/lib/bb/tests/fetch.py
> @@ -406,6 +406,8 @@ class MirrorUriTest(FetcherTest):
> : "git://somewhere.org/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http",
> ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890", "git://someserver.org/bitbake", "git://git.openembedded.org/bitbake")
> : "git://git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890",
> + ("gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https", ".*://.*/.*", "git://somewhere.org/somedir/MIRRORNAME;protocol=http")
> + : None,
> ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache")
> : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz",
> ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache/")
> @@ -447,7 +449,11 @@ class MirrorUriTest(FetcherTest):
> ud.setup_localpath(self.d)
> mirrors = bb.fetch2.mirror_from_string("%s %s" % (k[1], k[2]))
> newuris, uds = bb.fetch2.build_mirroruris(ud, mirrors, self.d)
> - self.assertEqual([v], newuris)
> + if not v:
> + self.assertEqual([v], newuris)
> + else:
> + self.assertEqual([], newuris)
> +
>
> def test_urilist1(self):
> fetcher = bb.fetch.FetchData("http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", self.d)
>
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [bitbake-devel] [PATCH v2] fetch2: make sure the uri added as expected
[not found] ` <1682DA98929F43DA.30286@lists.openembedded.org>
2021-06-02 2:24 ` [bitbake-devel] " Yu, Mingli
@ 2021-06-10 1:37 ` Yu, Mingli
1 sibling, 0 replies; 3+ messages in thread
From: Yu, Mingli @ 2021-06-10 1:37 UTC (permalink / raw)
To: bitbake-devel, richard.purdie
Ping.
Thanks,
On 5/27/21 3:04 PM, Yu, Mingli wrote:
> From: Mingli Yu <mingli.yu@windriver.com>
>
> When call uri_replace to get the new uris, we should guarantee the
> new uri is added when the replace uri begins with file if the find
> uri begin with wildcard which mapped as below.
> PREMIRRORS_append = " \
> .*://.*/.* git://somewhere.org/somedir/MIRRORNAME;protocol=http \n \
> " | |
> | |
> | |
> find replace
>
> Before the patch:
> the original uri
> gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https
>
> PREMIRRORS_append = " \
> .*://.*/.* git://somewhere.org/somedir/MIRRORNAME;protocol=http \n \
> "
> The new uri is git://somewhere.org/somedir/github.com.tianocore.edk2.git/git2_github.com.tianocore.edk2.git.tar.gz;protocol=http
>
> After the patch:
> the original uri
> gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https
>
> PREMIRRORS_append = " \
> .*://.*/.* git://somewhere.org/somedir/MIRRORNAME;protocol=http \n \
> "
> The new uri is None as the find begins with wildcard but the replace
> doesn't begin with file.
>
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
> lib/bb/fetch2/__init__.py | 2 ++
> lib/bb/tests/fetch.py | 8 +++++++-
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
> index cf0201c4..6701654b 100644
> --- a/lib/bb/fetch2/__init__.py
> +++ b/lib/bb/fetch2/__init__.py
> @@ -430,6 +430,8 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None):
> uri_replace_decoded = list(decodeurl(uri_replace))
> logger.debug2("For url %s comparing %s to %s" % (uri_decoded, uri_find_decoded, uri_replace_decoded))
> result_decoded = ['', '', '', '', '', {}]
> + if uri_find_decoded[0] == '.*' and uri_replace_decoded[0] != 'file':
> + uri_find_decoded[0] = uri_replace_decoded[0]
> for loc, i in enumerate(uri_find_decoded):
> result_decoded[loc] = uri_decoded[loc]
> regexp = i
> diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py
> index 9291ce4a..85a14301 100644
> --- a/lib/bb/tests/fetch.py
> +++ b/lib/bb/tests/fetch.py
> @@ -406,6 +406,8 @@ class MirrorUriTest(FetcherTest):
> : "git://somewhere.org/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http",
> ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890", "git://someserver.org/bitbake", "git://git.openembedded.org/bitbake")
> : "git://git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890",
> + ("gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https", ".*://.*/.*", "git://somewhere.org/somedir/MIRRORNAME;protocol=http")
> + : None,
> ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache")
> : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz",
> ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache/")
> @@ -447,7 +449,11 @@ class MirrorUriTest(FetcherTest):
> ud.setup_localpath(self.d)
> mirrors = bb.fetch2.mirror_from_string("%s %s" % (k[1], k[2]))
> newuris, uds = bb.fetch2.build_mirroruris(ud, mirrors, self.d)
> - self.assertEqual([v], newuris)
> + if not v:
> + self.assertEqual([v], newuris)
> + else:
> + self.assertEqual([], newuris)
> +
>
> def test_urilist1(self):
> fetcher = bb.fetch.FetchData("http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", self.d)
>
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread