diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-28 12:53:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-28 12:54:06 +0100 |
commit | 183dac4036cb73ad6cc620002b0044d3484a398d (patch) | |
tree | 2cbfbcb8e7ca1c1d197fbe969cec8862a2a5bb8d /bitbake/lib/bb/fetch2 | |
parent | a688c9cbab43179a92c8115cae5095817cafc0ea (diff) | |
download | poky-183dac4036cb73ad6cc620002b0044d3484a398d.tar.gz |
bitbake: Revert "fetch2: Cleanup file checksum generation"
This reverts commit 6dfb33fd7204e09815bde7ba5bf21941a73fe965.
It causes an unindeded change in behaviour.
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, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index bc4e8fd56b..5a03a0e46e 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -985,12 +985,15 @@ 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 | ||
988 | elif os.path.isdir(pth): | 989 | elif os.path.isdir(pth): |
989 | checksums.extend(checksum_dir(pth)) | 990 | checksums.extend(checksum_dir(pth)) |
991 | continue | ||
990 | else: | 992 | else: |
991 | checksum = checksum_file(pth) | 993 | checksum = checksum_file(pth) |
992 | if checksum: | 994 | |
993 | checksums.append((pth, checksum)) | 995 | if checksum: |
996 | checksums.append((pth, checksum)) | ||
994 | 997 | ||
995 | checksums.sort(key=operator.itemgetter(1)) | 998 | checksums.sort(key=operator.itemgetter(1)) |
996 | return checksums | 999 | return checksums |