aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-19 11:42:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-19 16:19:28 +0100
commitf5ea06fc2b6713c9f8e85ecf7cb981ae9a84d896 (patch)
tree0fe1fa433833dd3fa85b710c7ba9a9dac5531457
parentcf286dff653eed542bf347ca46234c224944d5b0 (diff)
downloadbitbake-master-next.tar.gz
bitbake-master-next.tar.bz2
bitbake-master-next.zip
siggen: Fix handling of tainted sig filesHEADmaster-nextmaster
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/siggen.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index f9c4798e..6a729f3b 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -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))