diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-12-02 10:58:35 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-05 16:16:10 +0000 |
commit | 897d1cd951efec07e326b129846306b27e03c9e5 (patch) | |
tree | f99e78c4ad1cd405c06737a63bb2ad8169be323e /bitbake/lib/bb | |
parent | dccb9b9fe826948e2d90a97b31998c31b114bed2 (diff) | |
download | poky-897d1cd951efec07e326b129846306b27e03c9e5.tar.gz |
fetch2: fix Exception parameters when BB_STRICT_CHECKSUM enabled
BB_STRICT_CHECKSUM caused a backtrace as the FetchError parameters are
incorrectly specified such that FetchError is being passed 8 params
when it's expecting 3. This fixes the parameters so we're passing a
formatted string and the url.
(Bitbake rev: b8b2f4287c9125542b18a294c0a94ed89a7e73a8)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 19a79fdbfe..3af56e5d0a 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -274,9 +274,9 @@ def verify_checksum(u, ud, d): | |||
274 | strict = d.getVar("BB_STRICT_CHECKSUM", True) or None | 274 | strict = d.getVar("BB_STRICT_CHECKSUM", True) or None |
275 | if (strict and ud.md5_expected == None and ud.sha256_expected == None): | 275 | if (strict and ud.md5_expected == None and ud.sha256_expected == None): |
276 | raise FetchError('No checksum specified for %s, please add at least one to the recipe:\n' | 276 | raise FetchError('No checksum specified for %s, please add at least one to the recipe:\n' |
277 | 'SRC_URI[%s] = "%s"\nSRC_URI[%s] = "%s"', u, | 277 | 'SRC_URI[%s] = "%s"\nSRC_URI[%s] = "%s"' % |
278 | ud.localpath, ud.md5_name, md5data, | 278 | (ud.localpath, ud.md5_name, md5data, |
279 | ud.sha256_name, sha256data) | 279 | ud.sha256_name, sha256data), u) |
280 | 280 | ||
281 | # Log missing sums so user can more easily add them | 281 | # Log missing sums so user can more easily add them |
282 | if ud.md5_expected == None: | 282 | if ud.md5_expected == None: |