summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-12-20 14:48:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-22 14:29:13 +0000
commit005af45191ded6185c618c708181b31281e43092 (patch)
treee7e81a1dfe354d71037a14b3d97577ae93a8ba2b /bitbake/lib
parent1edb126af3d614a1d9fb9561b1f1f858ec452563 (diff)
downloadpoky-005af45191ded6185c618c708181b31281e43092.tar.gz
bitbake: fetch2: avoid printing "no checksum" error message twice
Because of the way we were handling this error, it was printed twice - once via logger.error() (to avoid the log being printed) and a second time when the exception gets wrapped in a FuncFailed at a higher level. Call logger.error() earlier and change the text we send in the exception to be more brief, so it more closely resembles the behaviour when there is an invalid checksum. (Bitbake rev: 46765369d7f76ec7f67b90430131a79eb6a66235) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 6c6915cc5c..8fdf59cd58 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -527,10 +527,11 @@ def verify_checksum(ud, d):
527 # If strict checking enabled and neither sum defined, raise error 527 # If strict checking enabled and neither sum defined, raise error
528 strict = d.getVar("BB_STRICT_CHECKSUM", True) or None 528 strict = d.getVar("BB_STRICT_CHECKSUM", True) or None
529 if strict and not (ud.md5_expected or ud.sha256_expected): 529 if strict and not (ud.md5_expected or ud.sha256_expected):
530 raise NoChecksumError('No checksum specified for %s, please add at least one to the recipe:\n' 530 logger.error('No checksum specified for %s, please add at least one to the recipe:\n'
531 'SRC_URI[%s] = "%s"\nSRC_URI[%s] = "%s"' % 531 'SRC_URI[%s] = "%s"\nSRC_URI[%s] = "%s"' %
532 (ud.localpath, ud.md5_name, md5data, 532 (ud.localpath, ud.md5_name, md5data,
533 ud.sha256_name, sha256data), ud.url) 533 ud.sha256_name, sha256data))
534 raise NoChecksumError('Missing SRC_URI checksum', ud.url)
534 535
535 # Log missing sums so user can more easily add them 536 # Log missing sums so user can more easily add them
536 if not ud.md5_expected: 537 if not ud.md5_expected:
@@ -1424,9 +1425,7 @@ class Fetch(object):
1424 update_stamp(ud, self.d) 1425 update_stamp(ud, self.d)
1425 1426
1426 except BBFetchException as e: 1427 except BBFetchException as e:
1427 if isinstance(e, NoChecksumError): 1428 if isinstance(e, ChecksumError):
1428 logger.error("%s" % str(e))
1429 elif isinstance(e, ChecksumError):
1430 logger.error("Checksum failure fetching %s" % u) 1429 logger.error("Checksum failure fetching %s" % u)
1431 raise 1430 raise
1432 1431