diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-19 11:42:36 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-19 16:20:28 +0100 |
| commit | ae5615000bdd8eb572a597cb850385dd46836b43 (patch) | |
| tree | 1df3e6e6d3970d63d9e8107cbaeff29ccffa4d69 /bitbake | |
| parent | 047de6962ff0666f108ebdccd7c4a2b7492b4f5a (diff) | |
| download | openembedded-core-contrib-ae5615000bdd8eb572a597cb850385dd46836b43.tar.gz | |
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>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/siggen.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index f9c4798e3d..6a729f3b1e 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/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)) |