diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-22 16:36:48 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-24 10:08:18 +0000 |
| commit | 44a83b373e1fc34c93cd4a6c6cf8b73b230c1520 (patch) | |
| tree | a69c2bc3ae5492968cec8b263ee225f9b242a76d | |
| parent | 64498ecb094b7911d10b07c098d5a966e79f95b3 (diff) | |
| download | bitbake-44a83b373e1fc34c93cd4a6c6cf8b73b230c1520.tar.gz | |
fetch2: Fix url remap issue and add testcaseyocto-3.4.12021-10.1-honister1.52.1
Using "" as a target for .replace() is a really bad idea as it duplicates the replacement
for every character in the string. Add a testcase which triggered this and correct the
code to return the correct result.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3af1ecf049d2eed56f6d319dc7df6eb4a3d4eebc)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/__init__.py | 2 | ||||
| -rw-r--r-- | lib/bb/tests/fetch.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index b73b36951..25179bc2e 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -473,7 +473,7 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): basename = os.path.basename(ud.localpath) if basename: uri_basename = os.path.basename(uri_decoded[loc]) - if basename != uri_basename and result_decoded[loc].endswith(uri_basename): + if uri_basename and basename != uri_basename and result_decoded[loc].endswith(uri_basename): result_decoded[loc] = result_decoded[loc].replace(uri_basename, basename) elif not result_decoded[loc].endswith(basename): result_decoded[loc] = os.path.join(result_decoded[loc], basename) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 7edbf50b5..a85ebdf42 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -434,6 +434,7 @@ class MirrorUriTest(FetcherTest): ("git://user1@someserver.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master", "git://someserver.org/bitbake;branch=master", "git://user2@git.openembedded.org/bitbake;protocol=http") : "git://user2@git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master;protocol=http", + ("gitsm://git.qemu.org/git/seabios.git/;protocol=https;name=roms/seabios;subpath=roms/seabios;bareclone=1;nobranch=1;rev=1234567890123456789012345678901234567890", "gitsm://.*/.*", "http://petalinux.xilinx.com/sswreleases/rel-v${XILINX_VER_MAIN}/downloads") : "http://petalinux.xilinx.com/sswreleases/rel-v%24%7BXILINX_VER_MAIN%7D/downloads/git2_git.qemu.org.git.seabios.git..tar.gz", #Renaming files doesn't work #("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz" |