summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-28 12:53:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-28 12:54:06 +0100
commit183dac4036cb73ad6cc620002b0044d3484a398d (patch)
tree2cbfbcb8e7ca1c1d197fbe969cec8862a2a5bb8d /bitbake
parenta688c9cbab43179a92c8115cae5095817cafc0ea (diff)
downloadast2050-yocto-poky-183dac4036cb73ad6cc620002b0044d3484a398d.zip
ast2050-yocto-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')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index bc4e8fd..5a03a0e 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
OpenPOWER on IntegriCloud