diff options
| author |   Wenzong Fan <wenzong.fan@windriver.com> | 2012-07-11 11:28:11 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-11 11:42:34 +0100 |
| commit | 5f81a714f4fca785780bef555b419f0250e5ec1c (patch) | |
| tree | 9378c681835b4116a4809e45c67bf1219c237b78 /lib/bb/taskdata.py | |
| parent | bf0e5dddf0f63cdb0648fb6d872af5ceef6fbfb0 (diff) | |
| download | bitbake-5f81a714f4fca785780bef555b419f0250e5ec1c.tar.gz | |
bitbake: Abort build if runtime dependency conflict
Currently if there are multiple preferred providers available for
a runtime dependency, bitbake will print an Error message and let
the build go on. Anyways the build should abort while any Errors
occured.
[YOCTO #2734]
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/taskdata.py')
| -rw-r--r-- | lib/bb/taskdata.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/taskdata.py b/lib/bb/taskdata.py index 55cdde553..aed3a1638 100644 --- a/lib/bb/taskdata.py +++ b/lib/bb/taskdata.py @@ -482,6 +482,7 @@ class TaskData: providers_list.append(dataCache.pkg_fn[fn]) bb.event.fire(bb.event.MultipleProviders(item, providers_list, runtime=True), cfgData) self.consider_msgs_cache.append(item) + raise bb.providers.MultipleRProvider(item) # run through the list until we find one that we can build for fn in eligible: @@ -580,7 +581,7 @@ class TaskData: try: self.add_rprovider(cfgData, dataCache, target) added = added + 1 - except bb.providers.NoRProvider: + except (bb.providers.NoRProvider, bb.providers.MultipleRProvider): self.remove_runtarget(self.getrun_id(target)) logger.debug(1, "Resolved " + str(added) + " extra dependencies") if added == 0: |