From 4d6f8d4b74e6f6ab27d80ad0ad9871789b87c525 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Wed, 30 Nov 2011 11:24:55 -0600 Subject: siggen.py: If both sigs have a variable in it's whitelist then don't say it's changed Some BB_HASHBASE_WHITELIST variables are in the lists of variable dependencies for signatures. Ignore those differences in lists since this difference does not matter (Bitbake rev: 71b53a3f0766ca464560a1f6a449f9424fbdf7ae) Signed-off-by: Matthew McClintock Signed-off-by: Richard Purdie --- bitbake/lib/bb/siggen.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 8d768cea7d..22417b9cdc 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -236,13 +236,13 @@ def compare_sigfiles(a, b): p2 = pickle.Unpickler(file(b, "rb")) b_data = p2.load() - def dict_diff(a, b): + def dict_diff(a, b, whitelist=set()): sa = set(a.keys()) sb = set(b.keys()) common = sa & sb changed = set() for i in common: - if a[i] != b[i]: + if a[i] != b[i] and i not in whitelist: changed.add(i) added = sa - sb removed = sb - sa @@ -262,7 +262,7 @@ def compare_sigfiles(a, b): if a_data['basehash'] != b_data['basehash']: print "basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash']) - changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps']) + changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist']) if changed: for dep in changed: print "List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep]) -- cgit v1.2.3-54-g00ecf