From: "Yu, Mingli" <mingli.yu@windriver.com>
To: <bitbake-devel@lists.openembedded.org>
Subject: [PATCH v3] fetch2: make sure the uri added as expected
Date: Mon, 13 Sep 2021 13:48:10 +0800 [thread overview]
Message-ID: <20210913054810.30554-1-mingli.yu@windriver.com> (raw)
In-Reply-To: <168714731971476B.24733@lists.openembedded.org>
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 d9e1599a..1c5242c7 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 242be368..25893a34 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)
--
2.32.0
next parent reply other threads:[~2021-09-13 5:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <168714731971476B.24733@lists.openembedded.org>
2021-09-13 5:48 ` Yu, Mingli [this message]
2021-10-26 23:24 ` [bitbake-devel] [PATCH v3] fetch2: make sure the uri added as expected Alexandre Belloni
2021-10-27 6:45 ` Yu, Mingli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210913054810.30554-1-mingli.yu@windriver.com \
--to=mingli.yu@windriver.com \
--cc=bitbake-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.