bitbake: fetch2: print checksums when they are different then expected
* in form which can be copied into a recipe without modification * like oe-classic did since: http://git.openembedded.org/openembedded/commit/?id=68abc465559a68e9201c9525be3c4acc6297eaed * it shows them in right form when they are missing completely, but in more verbose form when different * it needs to print that only when checksums were requested, e.g. fetching from sstate mirror sets both md5mismatch and sha256mismatch, but your checksums shouldn't be shown (Bitbake rev: 9eb34fc866775fd8310759a0111f232a9dc98981) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
420891731f
commit
5d952ba4a0
|
@ -345,11 +345,17 @@ def verify_checksum(u, ud, d):
|
||||||
# We want to alert the user if a checksum is defined in the recipe but
|
# We want to alert the user if a checksum is defined in the recipe but
|
||||||
# it does not match.
|
# it does not match.
|
||||||
msg = ""
|
msg = ""
|
||||||
|
mismatch = False
|
||||||
if md5mismatch and ud.md5_expected:
|
if md5mismatch and ud.md5_expected:
|
||||||
msg = msg + "\nFile: '%s' has %s checksum %s when %s was expected" % (ud.localpath, 'md5', md5data, ud.md5_expected)
|
msg = msg + "\nFile: '%s' has %s checksum %s when %s was expected" % (ud.localpath, 'md5', md5data, ud.md5_expected)
|
||||||
|
mismatch = True;
|
||||||
|
|
||||||
if sha256mismatch and ud.sha256_expected:
|
if sha256mismatch and ud.sha256_expected:
|
||||||
msg = msg + "\nFile: '%s' has %s checksum %s when %s was expected" % (ud.localpath, 'sha256', sha256data, ud.sha256_expected)
|
msg = msg + "\nFile: '%s' has %s checksum %s when %s was expected" % (ud.localpath, 'sha256', sha256data, ud.sha256_expected)
|
||||||
|
mismatch = True;
|
||||||
|
|
||||||
|
if mismatch:
|
||||||
|
msg = msg + '\nYour checksums:\nSRC_URI[%s] = "%s"\nSRC_URI[%s] = "%s"' % (ud.md5_name, md5data, ud.sha256_name, sha256data)
|
||||||
|
|
||||||
if len(msg):
|
if len(msg):
|
||||||
raise ChecksumError('Checksum mismatch!%s' % msg, u)
|
raise ChecksumError('Checksum mismatch!%s' % msg, u)
|
||||||
|
|
Loading…
Reference in New Issue