From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 26 Jul 2016 03:36:40 +0000 (+1200)
Subject: bitbake: lib/bb/checksum: avoid exception on broken symlinks
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a849e7e9be6040bd76b76c24263f63f8f693753;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake: 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.

(Bitbake rev: 484fe5a3f5b840e5422cbdff0eef9aecfe944a19)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/checksum.py b/bitbake/lib/bb/checksum.py
index be4ab689150..84289208f44 100644
--- a/bitbake/lib/bb/checksum.py
+++ b/bitbake/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