aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Weaver <weaverjs@gmail.com>2021-07-06 16:30:21 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-06 23:28:24 +0100
commit731fb52eb03338c0bdb2a2256c22c64c22bcbace (patch)
tree3d039350210330ffed6d1aa1d68984461130d0bd
parent40b4e2dcd24d3ed01d35d705928133aaa1c4a93b (diff)
downloadbitbake-731fb52eb03338c0bdb2a2256c22c64c22bcbace.tar.gz
bitbake-731fb52eb03338c0bdb2a2256c22c64c22bcbace.tar.bz2
bitbake-731fb52eb03338c0bdb2a2256c22c64c22bcbace.zip
fetch2: add check for empty SRC_URI hash stringyocto-3.3.22021-04.2-hardknott1.50.2
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] 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>
-rw-r--r--lib/bb/fetch2/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index cf0201c4..c8e91262 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -562,6 +562,9 @@ def verify_checksum(ud, d, precomputed={}):
checksum_expected = getattr(ud, "%s_expected" % checksum_id)
+ if checksum_expected == '':
+ checksum_expected = None
+
return {
"id": checksum_id,
"name": checksum_name,
@@ -612,7 +615,7 @@ def verify_checksum(ud, d, precomputed={}):
for ci in checksum_infos:
if ci["expected"] and ci["expected"] != ci["data"]:
- messages.append("File: '%s' has %s checksum %s when %s was " \
+ messages.append("File: '%s' has %s checksum '%s' when '%s' was " \
"expected" % (ud.localpath, ci["id"], ci["data"], ci["expected"]))
bad_checksum = ci["data"]