summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-08-01 14:19:02 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-21 11:35:08 +0100
commitffff5fa2d7cf9c7af6475725ac3e71ffd4e4bfba (patch)
tree42c444b09e2ca9c76f841499adaff26c1b1f1aba
parent119b7ff164136c6633783f5501141af126df23fb (diff)
downloadpoky-ffff5fa2d7cf9c7af6475725ac3e71ffd4e4bfba.tar.gz
bitbake/fetch2: remove references to ChecksumError class
From: Matthew McClintock <msm@freescale.com> When merging fetch2 improvements from master into denzil, there were too many dependencies to pull in the entire ChecksumError class, so this patch removes references to ChecksumError for compatability. Fixes this issue: NameError: global name 'ChecksumError' is not defined Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 798a29b363..7e8bda2fa9 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -525,12 +525,8 @@ def try_mirror_url(newuri, origud, ud, ld, check = False):
525 raise 525 raise
526 526
527 except bb.fetch2.BBFetchException as e: 527 except bb.fetch2.BBFetchException as e:
528 if isinstance(e, ChecksumError): 528 logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url))
529 logger.warn("Mirror checksum failure for url %s (original url: %s)\nCleaning and trying again." % (newuri, origud.url)) 529 logger.debug(1, str(e))
530 logger.warn(str(e))
531 else:
532 logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url))
533 logger.debug(1, str(e))
534 try: 530 try:
535 ud.method.clean(ud, ld) 531 ud.method.clean(ud, ld)
536 except UnboundLocalError: 532 except UnboundLocalError: