diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 6 |
1 files 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): | |||
236 | p2 = pickle.Unpickler(file(b, "rb")) | 236 | p2 = pickle.Unpickler(file(b, "rb")) |
237 | b_data = p2.load() | 237 | b_data = p2.load() |
238 | 238 | ||
239 | def dict_diff(a, b): | 239 | def dict_diff(a, b, whitelist=set()): |
240 | sa = set(a.keys()) | 240 | sa = set(a.keys()) |
241 | sb = set(b.keys()) | 241 | sb = set(b.keys()) |
242 | common = sa & sb | 242 | common = sa & sb |
243 | changed = set() | 243 | changed = set() |
244 | for i in common: | 244 | for i in common: |
245 | if a[i] != b[i]: | 245 | if a[i] != b[i] and i not in whitelist: |
246 | changed.add(i) | 246 | changed.add(i) |
247 | added = sa - sb | 247 | added = sa - sb |
248 | removed = sb - sa | 248 | removed = sb - sa |
@@ -262,7 +262,7 @@ def compare_sigfiles(a, b): | |||
262 | if a_data['basehash'] != b_data['basehash']: | 262 | if a_data['basehash'] != b_data['basehash']: |
263 | print "basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash']) | 263 | print "basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash']) |
264 | 264 | ||
265 | changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps']) | 265 | changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist']) |
266 | if changed: | 266 | if changed: |
267 | for dep in changed: | 267 | for dep in changed: |
268 | print "List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep]) | 268 | print "List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep]) |