]> code.ossystems Code Review - openembedded-core.git/commitdiff
scripts/install-buildtools: Handle new format checksum files
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 24 Jun 2020 14:58:18 +0000 (15:58 +0100)
committerSteve Sakoman <steve@sakoman.com>
Mon, 29 Jun 2020 15:17:44 +0000 (05:17 -1000)
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>
scripts/install-buildtools

index 1a458a2cc75220ef28e275dba5159195553e68aa..fbf6a4bc3854aa719387219f2a4f47fc9aa7d552 100755 (executable)
@@ -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"))