diff options
| author |   Pavel Zhukov <pavel@zhukoff.net> | 2022-11-13 11:46:39 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-11-25 04:41:07 -1000 |
| commit | 7e268c107bb0240d583d2c34e24a71e373382509 (patch) | |
| tree | 1c07cffeff8722e192163ad2b5c20719471eea93 | |
| parent | 72a3afd99e8b785cb2a2f687e71a58e08cdd9c74 (diff) | |
| download | bitbake-7e268c107bb0240d583d2c34e24a71e373382509.tar.gz | |
gitsm: Fix regression in gitsm submodule path parsingyocto-4.0.7yocto-4.0.62022-04.7-kirkstone2022-04.6-kirkstone2.0.72.0.6
Commit 0361ecf7eb82c386a9842cf1f3cb706c0a112e77 introduced regression
in submodules path parsing. As the result gitsm fetcher fails on each
submodule which name begins from the name of the parent repo which is
totally valid usecase [Yocto #14045] [1]
Fix the code to error out only if submodule's name is equal to parent
name but not if it's part of it.
[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14045#c4
Signed-off-by: Pavel Zhukov <pavel@zhukoff.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3ad27272c18f2bb9edd441f840167a3dabd5407b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | lib/bb/fetch2/gitsm.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index 25d5db0e5..c5f7c03c4 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -115,7 +115,7 @@ class GitSM(Git): # This has to be a file reference proto = "file" url = "gitsm://" + uris[module] - if "{}{}".format(ud.host, ud.path) in url: + if url.endswith("{}{}".format(ud.host, ud.path)): raise bb.fetch2.FetchError("Submodule refers to the parent repository. This will cause deadlock situation in current version of Bitbake." \ "Consider using git fetcher instead.") |