From 183dac4036cb73ad6cc620002b0044d3484a398d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 28 Apr 2014 12:53:31 +0100 Subject: [PATCH] bitbake: Revert "fetch2: Cleanup file checksum generation" This reverts commit 6dfb33fd7204e09815bde7ba5bf21941a73fe965. It causes an unindeded change in behaviour. Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 7 +++++-- 1 file 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): checksum = checksum_file(f) if checksum: checksums.append((f, checksum)) + continue elif os.path.isdir(pth): checksums.extend(checksum_dir(pth)) + continue else: checksum = checksum_file(pth) - if checksum: - checksums.append((pth, checksum)) + + if checksum: + checksums.append((pth, checksum)) checksums.sort(key=operator.itemgetter(1)) return checksums