diff options
| -rw-r--r-- | bitbake/lib/bb/providers.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/taskdata.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index bd729df93d..24cb217edf 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py @@ -35,6 +35,8 @@ class NoProvider(bb.BBHandledException): class NoRProvider(bb.BBHandledException): """Exception raised when no provider of a runtime dependency can be found""" +class MultipleRProvider(bb.BBHandledException): + """Exception raised when multiple providers of a runtime dependency can be found""" def findProviders(cfgData, dataCache, pkg_pn = None): """ diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index 55cdde553b..aed3a1638d 100644 --- a/bitbake/lib/bb/taskdata.py +++ b/bitbake/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: |