From 0b5476a3fab7e951292c18637831a30f22c5d21d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Dec 2013 12:07:20 +0000 Subject: bitbake: siggen: Fix reversed difference output The output when comparing siginfo files for dict_diff is reversed and shows additions when things were removed and vice versa. This patch reverses the operation so the changes are shown correctly and makes the output less confusing. (Bitbake rev: 9b4142df36619099670740a5d3bc94e404ab2b56) Signed-off-by: Richard Purdie --- bitbake/lib/bb/siggen.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 370f6ad3b3..bc96fd3b7a 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -318,8 +318,8 @@ def compare_sigfiles(a, b, recursecb = None): for i in common: if a[i] != b[i] and i not in whitelist: changed.add(i) - added = sa - sb - removed = sb - sa + added = sb - sa + removed = sa - sb return changed, added, removed def file_checksums_diff(a, b): @@ -411,21 +411,21 @@ def compare_sigfiles(a, b, recursecb = None): bdep_found = False if removed: for bdep in removed: - if a[dep] == b[bdep]: + if b[dep] == a[bdep]: #output.append("Dependency on task %s was replaced by %s with same hash" % (dep, bdep)) bdep_found = True if not bdep_found: - output.append("Dependency on task %s was added with hash %s" % (clean_basepath(dep), a[dep])) + output.append("Dependency on task %s was added with hash %s" % (clean_basepath(dep), b[dep])) if removed: for dep in removed: adep_found = False if added: for adep in added: - if a[adep] == b[dep]: + if b[adep] == a[dep]: #output.append("Dependency on task %s was replaced by %s with same hash" % (adep, dep)) adep_found = True if not adep_found: - output.append("Dependency on task %s was removed with hash %s" % (clean_basepath(dep), b[dep])) + output.append("Dependency on task %s was removed with hash %s" % (clean_basepath(dep), a[dep])) if changed: for dep in changed: output.append("Hash for dependent task %s changed from %s to %s" % (clean_basepath(dep), a[dep], b[dep])) -- cgit v1.2.3-54-g00ecf