diff options
author | Jacob Kroon <jacob.kroon@mikrodidakt.se> | 2014-04-26 16:32:18 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-27 01:27:55 +0100 |
commit | d10353039eec600313dc6aabd308cccbbc758237 (patch) | |
tree | de16b8d20fc9b0c7c62e73f78addfac49751a9f4 /bitbake/lib/bb/fetch2 | |
parent | c7c58dbe42723dc6327e1867d71d63d120305e73 (diff) | |
download | poky-d10353039eec600313dc6aabd308cccbbc758237.tar.gz |
bitbake: fetch2: Cleanup file checksum generation
Cleanup the fix done in f9416e76e272ba3249abff099f6f3a47fe82e03e.
Instead of adding continue statements we can just move the last
statements into the final else-clause.
(Bitbake rev: 6dfb33fd7204e09815bde7ba5bf21941a73fe965)
Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 5a03a0e46e..bc4e8fd56b 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -985,15 +985,12 @@ def get_file_checksums(filelist, pn): | |||
985 | checksum = checksum_file(f) | 985 | checksum = checksum_file(f) |
986 | if checksum: | 986 | if checksum: |
987 | checksums.append((f, checksum)) | 987 | checksums.append((f, checksum)) |
988 | continue | ||
989 | elif os.path.isdir(pth): | 988 | elif os.path.isdir(pth): |
990 | checksums.extend(checksum_dir(pth)) | 989 | checksums.extend(checksum_dir(pth)) |
991 | continue | ||
992 | else: | 990 | else: |
993 | checksum = checksum_file(pth) | 991 | checksum = checksum_file(pth) |
994 | 992 | if checksum: | |
995 | if checksum: | 993 | checksums.append((pth, checksum)) |
996 | checksums.append((pth, checksum)) | ||
997 | 994 | ||
998 | checksums.sort(key=operator.itemgetter(1)) | 995 | checksums.sort(key=operator.itemgetter(1)) |
999 | return checksums | 996 | return checksums |