From dbcce81f661b167664c5d016bbfda7eb37224680 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 17 Nov 2011 14:02:06 +0000 Subject: siggen.py: Fix diffsigs output for filename comparisions When comparing sig files, if the recipe locations had changed, the dependent tasks list would show as changed even if the actual hash had not changed. This updates the code to only compare the base part of the pathnames. It also tweaks some of the output to add newlines to aid comparing two lists of variables as it makes the location of the difference clearer. (Bitbake rev: 165a22ddcc647b945707fb5c483146bb336d5f66) Signed-off-by: Richard Purdie --- bitbake/lib/bb/siggen.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 12257914cd..611772a27f 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -235,6 +235,16 @@ def compare_sigfiles(a, b): removed = sb - sa return changed, added, removed + def clean_basepaths(a): + b = {} + for x in a: + if x.startswith("virtual:"): + y = x.rsplit(":", 1)[0] + x.rsplit("/", 1)[1] + else: + y = x.rsplit("/", 1)[1] + b[y] = a[x] + return b + if 'basewhitelist' in a_data and a_data['basewhitelist'] != b_data['basewhitelist']: print "basewhitelist changed from %s to %s" % (a_data['basewhitelist'], b_data['basewhitelist']) @@ -242,7 +252,7 @@ def compare_sigfiles(a, b): print "taskwhitelist changed from %s to %s" % (a_data['taskwhitelist'], b_data['taskwhitelist']) if a_data['taskdeps'] != b_data['taskdeps']: - print "Task dependencies changed from %s to %s" % (sorted(a_data['taskdeps']), sorted(b_data['taskdeps'])) + print "Task dependencies changed from:\n%s\nto:\n%s" % (sorted(a_data['taskdeps']), sorted(b_data['taskdeps'])) if a_data['basehash'] != b_data['basehash']: print "basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash']) @@ -265,7 +275,9 @@ def compare_sigfiles(a, b): print "Variable %s value changed from %s to %s" % (dep, a_data['varvals'][dep], b_data['varvals'][dep]) if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data: - changed, added, removed = dict_diff(a_data['runtaskhashes'], b_data['runtaskhashes']) + a = clean_basepaths(a_data['runtaskhashes']) + b = clean_basepaths(b_data['runtaskhashes']) + changed, added, removed = dict_diff(a, b) if added: for dep in added: print "Dependency on task %s was added" % (dep) @@ -274,7 +286,7 @@ def compare_sigfiles(a, b): print "Dependency on task %s was removed" % (dep) if changed: for dep in changed: - print "Hash for dependent task %s changed from %s to %s" % (dep, a_data['runtaskhashes'][dep], b_data['runtaskhashes'][dep]) + print "Hash for dependent task %s changed from %s to %s" % (dep, a[dep], b[dep]) elif 'runtaskdeps' in a_data and 'runtaskdeps' in b_data and sorted(a_data['runtaskdeps']) != sorted(b_data['runtaskdeps']): print "Tasks this task depends on changed from %s to %s" % (sorted(a_data['runtaskdeps']), sorted(b_data['runtaskdeps'])) -- cgit v1.2.3-54-g00ecf