diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-10 16:53:45 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-22 20:22:14 +0000 |
| commit | 8e0744d6d4ab306809618adf63463a04d6664e48 (patch) | |
| tree | b0ab403e69241fe96e6db8f6e9816b58cf8f17d0 /lib | |
| parent | adc041fd9e3def29cdf9c1ae4849c5383bac46e5 (diff) | |
| download | bitbake-contrib-8e0744d6d4ab306809618adf63463a04d6664e48.tar.gz | |
siggen.py: Handle cases where the input to symmetric_difference() may be None
[YOCTO #1967]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/siggen.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index f31d66a17..f42bae25c 100644 --- a/lib/bb/siggen.py +++ b/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) |