diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2019-04-17 19:01:50 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-23 16:52:30 +0100 |
| commit | 724b4a5cec8c611d53350f3e5a3988ec3222684b (patch) | |
| tree | 4abd45edf609ecb6d387355e46fcada0700bc3e2 | |
| parent | 5127a8d8e6d53f5f43a6ada7fd09b6b0c24ae989 (diff) | |
| download | bitbake-724b4a5cec8c611d53350f3e5a3988ec3222684b.tar.gz | |
bb: siggen: Make dump_sigfile and compare_sigfiles print uuid4
This can make people easier to understand bitbake-diffsigs/dumpsig's output,
otherwise, it's hard to know it is a random uuid unless look into the code.
E.g.:
$ bitbake bc-native -ccleansstate -Snone
$ bitbake bc-native -ccleansstate -Snone
$ bitbake-diffsigs tmp/stamps/x86_64-linux/bc-native/1.07.1-r0.do_cleansstate.sigdata.*
* Before:
Taint (by forced/invalidated task) changed from nostamp:fe79d162-c4a8-4174-8007-f6d4aa09abdc to nostamp:28192187-5021-40c1-9e21-45483b62c910
* Now:
Taint (by forced/invalidated task) changed from nostamp(uuid4):fe79d162-c4a8-4174-8007-f6d4aa09abdc to nostamp(uuid4):28192187-5021-40c1-9e21-45483b62c910
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/siggen.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 09c9c8a25..89bf5339d 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -633,6 +633,10 @@ 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:'): + a_taint = a_taint.replace('nostamp:', 'nostamp(uuid4):') + if 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)) return output @@ -705,7 +709,11 @@ def dump_sigfile(a): output.append("Hash for dependent task %s is %s" % (dep, a_data['runtaskhashes'][dep])) if 'taint' in a_data: - output.append("Tainted (by forced/invalidated task): %s" % a_data['taint']) + if a_data['taint'].startswith('nostamp:'): + msg = a_data['taint'].replace('nostamp:', 'nostamp(uuid4):') + else: + msg = a_data['taint'] + output.append("Tainted (by forced/invalidated task): %s" % msg) if 'task' in a_data: computed_basehash = calc_basehash(a_data) |