[bitbake-devel] siggen: When printing signatures recursively, limit the output

Submitted by Richard Purdie on Dec. 19, 2013, 9:37 a.m. | Patch ID: 63573


Message ID 1387445859.6402.61.camel@ted
State New
Headers show

Commit Message

Richard Purdie Dec. 19, 2013, 9:37 a.m.
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Patch hide | download patch | download mbox

diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 52e698c4..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)