summaryrefslogtreecommitdiffstats
path: root/lib/bb/checksum.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-07-26 15:36:40 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-29 09:53:15 +0100
commit484fe5a3f5b840e5422cbdff0eef9aecfe944a19 (patch)
treec987c17224821c22982aa1b7e6b6fdcae8c38082 /lib/bb/checksum.py
parent8a6424ed871c3cbacd21cae8bc801197f83d67a6 (diff)
downloadbitbake-contrib-484fe5a3f5b840e5422cbdff0eef9aecfe944a19.tar.gz
lib/bb/checksum: avoid exception on broken symlinks
If using OE's externalsrc with a source tree that is not tracked by git and contains broken symlinks, you can receive "TypeError: unorderable types: NoneType() < str()" within the file checksum code due to: checksums.sort(key=operator.itemgetter(1)) Don't add files with no checksum to the checksums list in order to avoid this. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/checksum.py')
-rw-r--r--lib/bb/checksum.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/bb/checksum.py b/lib/bb/checksum.py
index be4ab6891..84289208f 100644
--- a/lib/bb/checksum.py
+++ b/lib/bb/checksum.py
@@ -120,13 +120,15 @@ class FileChecksumCache(MultiProcessCache):
checksums.extend(checksum_dir(f))
else:
checksum = checksum_file(f)
- checksums.append((f, checksum))
+ if checksum:
+ checksums.append((f, checksum))
elif os.path.isdir(pth):
if not os.path.islink(pth):
checksums.extend(checksum_dir(pth))
else:
checksum = checksum_file(pth)
- checksums.append((pth, checksum))
+ if checksum:
+ checksums.append((pth, checksum))
checksums.sort(key=operator.itemgetter(1))
return checksums