diff options
author | Scott Weaver <weaverjs@gmail.com> | 2021-09-05 18:27:36 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-07 21:54:39 +0100 |
commit | 4939a4198234c8dab1348590663c4681edae8fc9 (patch) | |
tree | 89f916fd019e0c3bc5594def7b7db12be99bba33 /bitbake/lib/bb/fetch2/__init__.py | |
parent | 77ee567007c24049891daf89e7154dfa2b4a3efd (diff) | |
download | poky-4939a4198234c8dab1348590663c4681edae8fc9.tar.gz |
bitbake: bitbake: fetch2: fix premirror URI when downloadfilename defined
When downloadfilename is defined in a recipe's SRC_URI and PREMIRRORS is also
defined using the same URI, the downloadfilename is appended to the mirror
URI and it should not be.
[YOCTO #13039]
(Bitbake rev: 8a3ff9f3eaf19d4258eb070c5dc230dface269b2)
Signed-off-by: Scott Weaver <weaverjs@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/__init__.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 914fa5c024..47a4943369 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -466,7 +466,7 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): | |||
466 | # Kill parameters, they make no sense for mirror tarballs | 466 | # Kill parameters, they make no sense for mirror tarballs |
467 | uri_decoded[5] = {} | 467 | uri_decoded[5] = {} |
468 | elif ud.localpath and ud.method.supports_checksum(ud): | 468 | elif ud.localpath and ud.method.supports_checksum(ud): |
469 | basename = os.path.basename(ud.localpath) | 469 | basename = os.path.basename(uri_decoded[loc]) |
470 | if basename and not result_decoded[loc].endswith(basename): | 470 | if basename and not result_decoded[loc].endswith(basename): |
471 | result_decoded[loc] = os.path.join(result_decoded[loc], basename) | 471 | result_decoded[loc] = os.path.join(result_decoded[loc], basename) |
472 | else: | 472 | else: |