From 3d34b49f4a4e2bc05ade5503d845d92f4051be43 Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Mon, 28 Apr 2014 19:14:56 +0200 Subject: bitbake: fetch2: Cleanup file checksum generation, v2 The initial version of this patch was reverted in 0a94e568152de550dedc8135a766beb18bf064ab However, it was later agreed upon that it was reverted due to a misunderstanding during code review; the patch is ok. This version of the patch also removes an unneeded initialization of the 'checksum' variable outside the scopes it is being used in. (Bitbake rev: 9ee19a3ca2f8e11a91f0289ea3486310c61d40f2) Signed-off-by: Jacob Kroon Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 5a03a0e46e..5a9c72f016 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -975,7 +975,6 @@ def get_file_checksums(filelist, pn): checksums = [] for pth in filelist.split(): - checksum = None if '*' in pth: # Handle globs for f in glob.glob(pth): @@ -985,15 +984,12 @@ 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 -- cgit v1.2.3-54-g00ecf