diff options
author | Scott Weaver <weaverjs@gmail.com> | 2021-07-06 16:30:21 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-06 23:28:30 +0100 |
commit | da0ce760c5372f8f2ef4c4dfa24b6995db73c66c (patch) | |
tree | 275367ec74160a61ebb05d140a666901f5a147a5 /bitbake/lib | |
parent | 731213e1b7e62cda3d21ddcfa20feba3be79b7ba (diff) | |
download | poky-da0ce760c5372f8f2ef4c4dfa24b6995db73c66c.tar.gz |
bitbake: fetch2: add check for empty SRC_URI hash string
No error was being reported when the hash string was set to empty.
For example: SRC_URI[md5sum] = ""
On a related note (not a bug):
Because whitespace in the string will result in a checksum mismatch, the error
message was updated to make it a little clearer why the error was thrown.
For example: SRC_URI[md5sum] = " " or
SRC_URI[md5sum] = " 209f8326f5137d8817a6276d9577a2f1"
Now creates a message like this:
File: '/home/scott/yocto-cache/downloads/rsync-3.2.3.tar.gz' has md5
checksum '209f8326f5137d8817a6276d9577a2f1' when ' 209f8326f5137d8817a6276d9577a2f1' was expected
[YOCTO #14232]
(Bitbake rev: 731fb52eb03338c0bdb2a2256c22c64c22bcbace)
Signed-off-by: Scott Weaver <weaverjs@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a13510d0028e234ea2f4744b0d0c38558395c70f)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index cf0201c490..c8e91262a9 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -562,6 +562,9 @@ def verify_checksum(ud, d, precomputed={}): | |||
562 | 562 | ||
563 | checksum_expected = getattr(ud, "%s_expected" % checksum_id) | 563 | checksum_expected = getattr(ud, "%s_expected" % checksum_id) |
564 | 564 | ||
565 | if checksum_expected == '': | ||
566 | checksum_expected = None | ||
567 | |||
565 | return { | 568 | return { |
566 | "id": checksum_id, | 569 | "id": checksum_id, |
567 | "name": checksum_name, | 570 | "name": checksum_name, |
@@ -612,7 +615,7 @@ def verify_checksum(ud, d, precomputed={}): | |||
612 | 615 | ||
613 | for ci in checksum_infos: | 616 | for ci in checksum_infos: |
614 | if ci["expected"] and ci["expected"] != ci["data"]: | 617 | if ci["expected"] and ci["expected"] != ci["data"]: |
615 | messages.append("File: '%s' has %s checksum %s when %s was " \ | 618 | messages.append("File: '%s' has %s checksum '%s' when '%s' was " \ |
616 | "expected" % (ud.localpath, ci["id"], ci["data"], ci["expected"])) | 619 | "expected" % (ud.localpath, ci["id"], ci["data"], ci["expected"])) |
617 | bad_checksum = ci["data"] | 620 | bad_checksum = ci["data"] |
618 | 621 | ||