From d366c1890ee706870bbf6fec714fba9022a54329 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 10 Feb 2012 16:53:45 +0000 Subject: siggen.py: Handle cases where the input to symmetric_difference() may be None [YOCTO #1967] (Bitbake rev: f6cee29bf853874876923a7d6ae8574e3801ae8d) Signed-off-by: Richard Purdie --- bitbake/lib/bb/siggen.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bitbake') 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): 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']) - print "changed items: %s" % a_data['basewhitelist'].symmetric_difference(b_data['basewhitelist']) + if a_data['basewhitelist'] and b_data['basewhitelist']: + print "changed items: %s" % a_data['basewhitelist'].symmetric_difference(b_data['basewhitelist']) if 'taskwhitelist' in a_data and a_data['taskwhitelist'] != b_data['taskwhitelist']: print "taskwhitelist changed from %s to %s" % (a_data['taskwhitelist'], b_data['taskwhitelist']) - print "changed items: %s" % a_data['taskwhitelist'].symmetric_difference(b_data['taskwhitelist']) + if a_data['taskwhitelist'] and b_data['taskwhitelist']: + print "changed items: %s" % a_data['taskwhitelist'].symmetric_difference(b_data['taskwhitelist']) if a_data['taskdeps'] != b_data['taskdeps']: 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): 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]) - print "changed items: %s" % a_data['gendeps'][dep].symmetric_difference(b_data['gendeps'][dep]) + if a_data['gendeps'][dep] and b_data['gendeps'][dep]: + print "changed items: %s" % a_data['gendeps'][dep].symmetric_difference(b_data['gendeps'][dep]) if added: for dep in added: print "Dependency on variable %s was added" % (dep) -- cgit v1.2.3-54-g00ecf