From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 24 Jun 2020 14:58:18 +0000 (+0100)
Subject: scripts/install-buildtools: Handle new format checksum files
X-Git-Tag: 2020-04.2-dunfell~69
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=877a082b5f3f5ccf8191a2438e7707b419174ea9;p=openembedded-core.git

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d1e71bf5b399372166eb40bb0d99c8fb52231600)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

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():
                 if ret != 0:
                     logger.error("Could not download file from %s" % check_url)
                     return ret
-            regex = re.compile(r"^(?P<checksum>[0-9a-f]+)\s\s(?P<path>.*/)?(?P<filename>.*)$")
+            regex = re.compile(r"^(?P<checksum>[0-9a-f]+)\s+(?P<path>.*/)?(?P<filename>.*)$")
             with open(tmpbuildtools_checksum, 'rb') as f:
                 original = f.read()
                 m = re.search(regex, original.decode("utf-8"))