diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2/__init__.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 83122e856c..914553aaf7 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -29,11 +29,9 @@ from __future__ import absolute_import | |||
29 | from __future__ import print_function | 29 | from __future__ import print_function |
30 | import os, re | 30 | import os, re |
31 | import signal | 31 | import signal |
32 | import glob | ||
33 | import logging | 32 | import logging |
34 | import urllib | 33 | import urllib |
35 | import urlparse | 34 | import urlparse |
36 | import operator | ||
37 | import bb.persist_data, bb.utils | 35 | import bb.persist_data, bb.utils |
38 | import bb.checksum | 36 | import bb.checksum |
39 | from bb import data | 37 | from bb import data |
@@ -1108,48 +1106,7 @@ def get_file_checksums(filelist, pn): | |||
1108 | it proceeds | 1106 | it proceeds |
1109 | 1107 | ||
1110 | """ | 1108 | """ |
1111 | 1109 | return _checksum_cache.get_checksums(filelist, pn) | |
1112 | def checksum_file(f): | ||
1113 | try: | ||
1114 | checksum = _checksum_cache.get_checksum(f) | ||
1115 | except OSError as e: | ||
1116 | bb.warn("Unable to get checksum for %s SRC_URI entry %s: %s" % (pn, os.path.basename(f), e)) | ||
1117 | return None | ||
1118 | return checksum | ||
1119 | |||
1120 | def checksum_dir(pth): | ||
1121 | # Handle directories recursively | ||
1122 | dirchecksums = [] | ||
1123 | for root, dirs, files in os.walk(pth): | ||
1124 | for name in files: | ||
1125 | fullpth = os.path.join(root, name) | ||
1126 | checksum = checksum_file(fullpth) | ||
1127 | if checksum: | ||
1128 | dirchecksums.append((fullpth, checksum)) | ||
1129 | return dirchecksums | ||
1130 | |||
1131 | checksums = [] | ||
1132 | for pth in filelist.split(): | ||
1133 | exist = pth.split(":")[1] | ||
1134 | if exist == "False": | ||
1135 | continue | ||
1136 | pth = pth.split(":")[0] | ||
1137 | if '*' in pth: | ||
1138 | # Handle globs | ||
1139 | for f in glob.glob(pth): | ||
1140 | if os.path.isdir(f): | ||
1141 | checksums.extend(checksum_dir(f)) | ||
1142 | else: | ||
1143 | checksum = checksum_file(f) | ||
1144 | checksums.append((f, checksum)) | ||
1145 | elif os.path.isdir(pth): | ||
1146 | checksums.extend(checksum_dir(pth)) | ||
1147 | else: | ||
1148 | checksum = checksum_file(pth) | ||
1149 | checksums.append((pth, checksum)) | ||
1150 | |||
1151 | checksums.sort(key=operator.itemgetter(1)) | ||
1152 | return checksums | ||
1153 | 1110 | ||
1154 | 1111 | ||
1155 | class FetchData(object): | 1112 | class FetchData(object): |