diff options
| author | Chris Johns <chrisj@rtems.org> | 2019-08-15 13:28:04 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2019-08-27 11:02:53 +1000 |
| commit | 61ce77bcb5ab480dcee9bce90bf667114b79d115 (patch) | |
| tree | 0522b70b70652f72c17411317d18828cc9e233e0 | |
| parent | 6: Update unstable RTEMS 6 tool chain (diff) | |
| download | rtems-source-builder-61ce77bcb5ab480dcee9bce90bf667114b79d115.tar.bz2 | |
sb/download: Add support for a base64 hash string
| -rw-r--r-- | source-builder/sb/download.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source-builder/sb/download.py b/source-builder/sb/download.py index d8061e6..1fb0155 100644 --- a/source-builder/sb/download.py +++ b/source-builder/sb/download.py @@ -24,6 +24,7 @@ from __future__ import print_function +import base64 import hashlib import os import re @@ -110,8 +111,13 @@ def _hash_check(file_, absfile, macros, remove = True): raise if _in is not None: _in.close() - log.output('checksums: %s: %s => %s' % (file_, hasher.hexdigest(), hash[1])) - if hasher.hexdigest() != hash[1]: + hash_hex = hasher.hexdigest() + hash_base64 = base64.b64encode(hasher.digest()).decode('utf-8') + log.output('checksums: %s: (hex: %s) (b64: %s) => %s' % (file_, + hash_hex, + hash_base64, + hash[1])) + if hash_hex != hash[1] and hash_base64 != hash[1]: log.warning('checksum error: %s' % (file_)) failed = True if failed and remove: |