]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake: siggen: Fix handling of tainted sig files
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 19 Jul 2019 10:42:36 +0000 (11:42 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 19 Jul 2019 15:20:28 +0000 (16:20 +0100)
The addition of some debugging code meant that comparisions between sig
files with a taint and without a taint weren't working. Tweak the logic
to avoid tracebacks if one side doesn't have a taint.

(Bitbake rev: f5ea06fc2b6713c9f8e85ecf7cb981ae9a84d896)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/bb/siggen.py

index f9c4798e3d7bca4aa2297f467f4165a13e5e1e6c..6a729f3b1ecb8edf2d3c9e2fc7159f104fce5eb4 100644 (file)
@@ -645,9 +645,9 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
     a_taint = a_data.get('taint', None)
     b_taint = b_data.get('taint', None)
     if a_taint != b_taint:
-        if a_taint.startswith('nostamp:'):
+        if a_taint and a_taint.startswith('nostamp:'):
             a_taint = a_taint.replace('nostamp:', 'nostamp(uuid4):')
-        if b_taint.startswith('nostamp:'):
+        if b_taint and b_taint.startswith('nostamp:'):
             b_taint = b_taint.replace('nostamp:', 'nostamp(uuid4):')
         output.append(color_format("{color_title}Taint (by forced/invalidated task) changed{color_default} from %s to %s") % (a_taint, b_taint))