From 555d4ec444855dfba170be33e7fc0c067089616c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 19 Dec 2013 09:37:39 +0000 Subject: [PATCH] bitbake: siggen: When printing signatures recursively, limit the output Currently the code prints all differences. If the task dependencies have changed hash, we recurse into those and print those differences as well. This leads to a lot of output. The reality is if the parents changed signature, we might as well just say that and recurse with no other output since we're much more interested in how the parents changed in nearly all cases. The changes in the parent are probably the same ones we'd have printed at each level anyway. By doing this we focus the output more carefully on the thing the user wants/needs to see. (Bitbake rev: 7a17fd6e51a76d3582c357b79f5ef86e1969650c) Signed-off-by: Richard Purdie --- bitbake/lib/bb/siggen.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 52e698c..370f6ad 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -430,9 +430,11 @@ def compare_sigfiles(a, b, recursecb = None): for dep in changed: output.append("Hash for dependent task %s changed from %s to %s" % (clean_basepath(dep), a[dep], b[dep])) if callable(recursecb): + # If a dependent hash changed, might as well print the line above and then defer to the changes in + # that hash since in all likelyhood, they're the same changes this task also saw. recout = recursecb(dep, a[dep], b[dep]) if recout: - output.extend(recout) + output = [output[-1]] + recout a_taint = a_data.get('taint', None) b_taint = b_data.get('taint', None) -- 2.7.4