diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2017-06-27 17:33:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-06 14:38:14 +0100 |
commit | afedb883da3361e9c8a217d19ac48faa9ac36d78 (patch) | |
tree | 2e0ef313416bebe711a25613ee73b976243036c6 /scripts/lib/compatlayer/__init__.py | |
parent | 158575af9d0ab08a45eb307254bacc147e1e28ab (diff) | |
download | poky-afedb883da3361e9c8a217d19ac48faa9ac36d78.tar.gz |
yocto-compat-layer.py: tolerate broken world builds during signature diff
The "test_signatures" test ignored a broken world build when getting
signatures, but the code which then tried to analyze a difference
found by the test didn't, which prevented printing the difference.
(From OE-Core rev: e8416554dfc9d4196543279a4845f6c0671f3e5c)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/compatlayer/__init__.py')
-rw-r--r-- | scripts/lib/compatlayer/__init__.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index eaae4e534f..451e1de950 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py | |||
@@ -290,7 +290,7 @@ def get_signatures(builddir, failsafe=False, machine=None): | |||
290 | 290 | ||
291 | return (sigs, tune2tasks) | 291 | return (sigs, tune2tasks) |
292 | 292 | ||
293 | def get_depgraph(targets=['world']): | 293 | def get_depgraph(targets=['world'], failsafe=False): |
294 | ''' | 294 | ''' |
295 | Returns the dependency graph for the given target(s). | 295 | Returns the dependency graph for the given target(s). |
296 | The dependency graph is taken directly from DepTreeEvent. | 296 | The dependency graph is taken directly from DepTreeEvent. |
@@ -309,6 +309,11 @@ def get_depgraph(targets=['world']): | |||
309 | elif isinstance(event, bb.command.CommandCompleted): | 309 | elif isinstance(event, bb.command.CommandCompleted): |
310 | break | 310 | break |
311 | elif isinstance(event, bb.event.NoProvider): | 311 | elif isinstance(event, bb.event.NoProvider): |
312 | if failsafe: | ||
313 | # The event is informational, we will get information about the | ||
314 | # remaining dependencies eventually and thus can ignore this | ||
315 | # here like we do in get_signatures(), if desired. | ||
316 | continue | ||
312 | if event._reasons: | 317 | if event._reasons: |
313 | raise RuntimeError('Nothing provides %s: %s' % (event._item, event._reasons)) | 318 | raise RuntimeError('Nothing provides %s: %s' % (event._item, event._reasons)) |
314 | else: | 319 | else: |