mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
bitbake: siggen: Fix handling of tainted sig files
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>
This commit is contained in:
@@ -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))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user