diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 68ef3a722f..9d27d539c1 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -564,7 +564,7 @@ class RunQueue: | |||
564 | # Check to make sure we still have tasks to run | 564 | # Check to make sure we still have tasks to run |
565 | if len(self.runq_fnid) == 0: | 565 | if len(self.runq_fnid) == 0: |
566 | if not taskData.abort: | 566 | if not taskData.abort: |
567 | bb.msg.note(1, bb.msg.domain.RunQueue, "All possible tasks have been run but build incomplete (--continue mode). See errors above for incomplete tasks.") | 567 | bb.msg.note(1, bb.msg.domain.RunQueue, "All buildable tasks have been run but the build is incomplete (--continue mode). Errors for the tasks that failed will have been printed above.") |
568 | return | 568 | return |
569 | bb.msg.fatal(bb.msg.domain.RunQueue, "No active tasks and not in --continue mode?! Please report this bug.") | 569 | bb.msg.fatal(bb.msg.domain.RunQueue, "No active tasks and not in --continue mode?! Please report this bug.") |
570 | 570 | ||
@@ -630,7 +630,7 @@ class RunQueue: | |||
630 | for prov in prov_list: | 630 | for prov in prov_list: |
631 | if len(prov_list[prov]) > 1 and prov not in self.multi_provider_whitelist: | 631 | if len(prov_list[prov]) > 1 and prov not in self.multi_provider_whitelist: |
632 | error = True | 632 | error = True |
633 | bb.msg.error(bb.msg.domain.RunQueue, "Multiple files due to be built which all provide %s (%s)" % (prov, " ".join(prov_list[prov]))) | 633 | bb.msg.error(bb.msg.domain.RunQueue, "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]))) |
634 | #if error: | 634 | #if error: |
635 | # bb.msg.fatal(bb.msg.domain.RunQueue, "Corrupted metadata configuration detected, aborting...") | 635 | # bb.msg.fatal(bb.msg.domain.RunQueue, "Corrupted metadata configuration detected, aborting...") |
636 | 636 | ||