summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/siggen.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-10 16:53:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-10 16:57:27 +0000
commitd366c1890ee706870bbf6fec714fba9022a54329 (patch)
treeef611eedc07bd707b6a9b17fd3b51a2691886d12 /bitbake/lib/bb/siggen.py
parentd3d11016de28e955d492bc174be2bfac90a78265 (diff)
downloadpoky-d366c1890ee706870bbf6fec714fba9022a54329.tar.gz
siggen.py: Handle cases where the input to symmetric_difference() may be None
[YOCTO #1967] (Bitbake rev: f6cee29bf853874876923a7d6ae8574e3801ae8d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/siggen.py')
-rw-r--r--bitbake/lib/bb/siggen.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index f31d66a176..f42bae25c5 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -261,11 +261,13 @@ def compare_sigfiles(a, b):
261 261
262 if 'basewhitelist' in a_data and a_data['basewhitelist'] != b_data['basewhitelist']: 262 if 'basewhitelist' in a_data and a_data['basewhitelist'] != b_data['basewhitelist']:
263 print "basewhitelist changed from %s to %s" % (a_data['basewhitelist'], b_data['basewhitelist']) 263 print "basewhitelist changed from %s to %s" % (a_data['basewhitelist'], b_data['basewhitelist'])
264 print "changed items: %s" % a_data['basewhitelist'].symmetric_difference(b_data['basewhitelist']) 264 if a_data['basewhitelist'] and b_data['basewhitelist']:
265 print "changed items: %s" % a_data['basewhitelist'].symmetric_difference(b_data['basewhitelist'])
265 266
266 if 'taskwhitelist' in a_data and a_data['taskwhitelist'] != b_data['taskwhitelist']: 267 if 'taskwhitelist' in a_data and a_data['taskwhitelist'] != b_data['taskwhitelist']:
267 print "taskwhitelist changed from %s to %s" % (a_data['taskwhitelist'], b_data['taskwhitelist']) 268 print "taskwhitelist changed from %s to %s" % (a_data['taskwhitelist'], b_data['taskwhitelist'])
268 print "changed items: %s" % a_data['taskwhitelist'].symmetric_difference(b_data['taskwhitelist']) 269 if a_data['taskwhitelist'] and b_data['taskwhitelist']:
270 print "changed items: %s" % a_data['taskwhitelist'].symmetric_difference(b_data['taskwhitelist'])
269 271
270 if a_data['taskdeps'] != b_data['taskdeps']: 272 if a_data['taskdeps'] != b_data['taskdeps']:
271 print "Task dependencies changed from:\n%s\nto:\n%s" % (sorted(a_data['taskdeps']), sorted(b_data['taskdeps'])) 273 print "Task dependencies changed from:\n%s\nto:\n%s" % (sorted(a_data['taskdeps']), sorted(b_data['taskdeps']))
@@ -277,7 +279,8 @@ def compare_sigfiles(a, b):
277 if changed: 279 if changed:
278 for dep in changed: 280 for dep in changed:
279 print "List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep]) 281 print "List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep])
280 print "changed items: %s" % a_data['gendeps'][dep].symmetric_difference(b_data['gendeps'][dep]) 282 if a_data['gendeps'][dep] and b_data['gendeps'][dep]:
283 print "changed items: %s" % a_data['gendeps'][dep].symmetric_difference(b_data['gendeps'][dep])
281 if added: 284 if added:
282 for dep in added: 285 for dep in added:
283 print "Dependency on variable %s was added" % (dep) 286 print "Dependency on variable %s was added" % (dep)