diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-24 15:58:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-02 16:12:37 +0100 |
commit | c2b1198b7901ef1fa9d8a6d529a58cc09b6763a9 (patch) | |
tree | edc64b7afe08a94b503df816175a3c1c08a15585 /scripts/install-buildtools | |
parent | bceae9e7dee9caed3ea29a576a1b5a680b8c149d (diff) | |
download | poky-c2b1198b7901ef1fa9d8a6d529a58cc09b6763a9.tar.gz |
scripts/install-buildtools: Handle new format checksum files
Autobuilder generated checksum files only have a single space between the sum and the
filename, tweak it to account for this.
(From OE-Core rev: 877a082b5f3f5ccf8191a2438e7707b419174ea9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d1e71bf5b399372166eb40bb0d99c8fb52231600)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/install-buildtools')
-rwxr-xr-x | scripts/install-buildtools | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/install-buildtools b/scripts/install-buildtools index 1a458a2cc7..fbf6a4bc38 100755 --- a/scripts/install-buildtools +++ b/scripts/install-buildtools | |||
@@ -239,7 +239,7 @@ def main(): | |||
239 | if ret != 0: | 239 | if ret != 0: |
240 | logger.error("Could not download file from %s" % check_url) | 240 | logger.error("Could not download file from %s" % check_url) |
241 | return ret | 241 | return ret |
242 | regex = re.compile(r"^(?P<checksum>[0-9a-f]+)\s\s(?P<path>.*/)?(?P<filename>.*)$") | 242 | regex = re.compile(r"^(?P<checksum>[0-9a-f]+)\s+(?P<path>.*/)?(?P<filename>.*)$") |
243 | with open(tmpbuildtools_checksum, 'rb') as f: | 243 | with open(tmpbuildtools_checksum, 'rb') as f: |
244 | original = f.read() | 244 | original = f.read() |
245 | m = re.search(regex, original.decode("utf-8")) | 245 | m = re.search(regex, original.decode("utf-8")) |