summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py8
1 files changed, 2 insertions, 6 deletions
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):
975 975
976 checksums = [] 976 checksums = []
977 for pth in filelist.split(): 977 for pth in filelist.split():
978 checksum = None
979 if '*' in pth: 978 if '*' in pth:
980 # Handle globs 979 # Handle globs
981 for f in glob.glob(pth): 980 for f in glob.glob(pth):
@@ -985,15 +984,12 @@ def get_file_checksums(filelist, pn):
985 checksum = checksum_file(f) 984 checksum = checksum_file(f)
986 if checksum: 985 if checksum:
987 checksums.append((f, checksum)) 986 checksums.append((f, checksum))
988 continue
989 elif os.path.isdir(pth): 987 elif os.path.isdir(pth):
990 checksums.extend(checksum_dir(pth)) 988 checksums.extend(checksum_dir(pth))
991 continue
992 else: 989 else:
993 checksum = checksum_file(pth) 990 checksum = checksum_file(pth)
994 991 if checksum:
995 if checksum: 992 checksums.append((pth, checksum))
996 checksums.append((pth, checksum))
997 993
998 checksums.sort(key=operator.itemgetter(1)) 994 checksums.sort(key=operator.itemgetter(1))
999 return checksums 995 return checksums