diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 7bf432083a..c24841ffcd 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -187,6 +187,7 @@ class RunQueueData: | |||
187 | self.taskData = taskData | 187 | self.taskData = taskData |
188 | self.targets = targets | 188 | self.targets = targets |
189 | self.rq = rq | 189 | self.rq = rq |
190 | self.warn_multi_bb = False | ||
190 | 191 | ||
191 | self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST", 1) or "" | 192 | self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST", 1) or "" |
192 | self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST", 1) or "").split() | 193 | self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST", 1) or "").split() |
@@ -674,11 +675,14 @@ class RunQueueData: | |||
674 | prov_list[prov] = [fn] | 675 | prov_list[prov] = [fn] |
675 | elif fn not in prov_list[prov]: | 676 | elif fn not in prov_list[prov]: |
676 | prov_list[prov].append(fn) | 677 | prov_list[prov].append(fn) |
677 | error = False | ||
678 | for prov in prov_list: | 678 | for prov in prov_list: |
679 | if len(prov_list[prov]) > 1 and prov not in self.multi_provider_whitelist: | 679 | if len(prov_list[prov]) > 1 and prov not in self.multi_provider_whitelist: |
680 | error = True | 680 | msg = "Multiple .bb files are due to be built which each provide %s (%s)." % (prov, " ".join(prov_list[prov])) |
681 | logger.error("Multiple .bb files are due to be built which each provide %s (%s).\n This usually means one provides something the other doesn't and should.", prov, " ".join(prov_list[prov])) | 681 | if self.warn_multi_bb: |
682 | logger.warn(msg) | ||
683 | else: | ||
684 | msg += "\n This usually means one provides something the other doesn't and should." | ||
685 | logger.error(msg) | ||
682 | 686 | ||
683 | 687 | ||
684 | # Create a whitelist usable by the stamp checks | 688 | # Create a whitelist usable by the stamp checks |