summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-01-13 17:01:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-15 10:06:21 +0000
commitdcf6b641fe3a9a1525290da788648aab3204d48c (patch)
tree7e8b9a93750830914cd1ee62d5ae509c71223bd0 /bitbake/lib/bb/fetch2
parent98a610b3db682744ea32bb042a750d2d8b164892 (diff)
downloadpoky-dcf6b641fe3a9a1525290da788648aab3204d48c.tar.gz
bitbake/fetch2: improve error formatting for fetcher errors
* The "name" argument to FuncFailed is rarely used as a name in actual usage within bitbake, so don't treat it as one in the output. * Don't print URL for FetchError if it was not specified (i.e. don't output "Fetcher failure for URL 'None'") * Don't include URL in "unable to fetch from any source" message since we supply it to FetchError and it will be printed anyway. * Don't include URL in "checksum failed" message for the same reason (Bitbake rev: 86811bd85e2e453ee92a05fe60160d9b49ac69e8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 3af56e5d0a..21abb13b19 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -55,7 +55,10 @@ class MalformedUrl(BBFetchException):
55class FetchError(BBFetchException): 55class FetchError(BBFetchException):
56 """General fetcher exception when something happens incorrectly""" 56 """General fetcher exception when something happens incorrectly"""
57 def __init__(self, message, url = None): 57 def __init__(self, message, url = None):
58 msg = "Fetcher failure for URL: '%s'. %s" % (url, message) 58 if url:
59 msg = "Fetcher failure for URL: '%s'. %s" % (url, message)
60 else:
61 msg = "Fetcher failure: %s" % message
59 self.url = url 62 self.url = url
60 BBFetchException.__init__(self, msg) 63 BBFetchException.__init__(self, msg)
61 self.args = (message, url) 64 self.args = (message, url)
@@ -302,10 +305,10 @@ def verify_checksum(u, ud, d):
302 # it does not match. 305 # it does not match.
303 msg = "" 306 msg = ""
304 if md5mismatch and ud.md5_expected: 307 if md5mismatch and ud.md5_expected:
305 msg = msg + "\nFile: '%s' has %s checksum %s when %s was expected (from URL: '%s')" % (ud.localpath, 'md5', md5data, ud.md5_expected, u) 308 msg = msg + "\nFile: '%s' has %s checksum %s when %s was expected" % (ud.localpath, 'md5', md5data, ud.md5_expected)
306 309
307 if sha256mismatch and ud.sha256_expected: 310 if sha256mismatch and ud.sha256_expected:
308 msg = msg + "\nFile: '%s' has %s checksum %s when %s was expected (from URL: '%s')" % (ud.localpath, 'sha256', sha256data, ud.sha256_expected, u) 311 msg = msg + "\nFile: '%s' has %s checksum %s when %s was expected" % (ud.localpath, 'sha256', sha256data, ud.sha256_expected)
309 312
310 if len(msg): 313 if len(msg):
311 raise FetchError('Checksum mismatch!%s' % msg, u) 314 raise FetchError('Checksum mismatch!%s' % msg, u)
@@ -983,7 +986,7 @@ class Fetch(object):
983 localpath = try_mirrors (self.d, ud, mirrors) 986 localpath = try_mirrors (self.d, ud, mirrors)
984 987
985 if not localpath or ((not os.path.exists(localpath)) and localpath.find("*") == -1): 988 if not localpath or ((not os.path.exists(localpath)) and localpath.find("*") == -1):
986 raise FetchError("Unable to fetch URL %s from any source." % u, u) 989 raise FetchError("Unable to fetch URL from any source.", u)
987 990
988 update_stamp(u, ud, self.d) 991 update_stamp(u, ud, self.d)
989 992