summaryrefslogtreecommitdiffstats
path: root/bitbake-dev/lib/bb/taskdata.py
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-06 13:16:13 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-06 13:16:13 +0000
commitffdec425bfb26e152d1da5824a36dfe1fe72cd92 (patch)
tree38a5233e01e62d57964dbb0bf38ca88a92049386 /bitbake-dev/lib/bb/taskdata.py
parent4be017e82fdfbfbe1bf484bf745e770d18417918 (diff)
downloadpoky-ffdec425bfb26e152d1da5824a36dfe1fe72cd92.tar.gz
bitbake/bitbake-dev: Sync with upstream
Diffstat (limited to 'bitbake-dev/lib/bb/taskdata.py')
-rw-r--r--bitbake-dev/lib/bb/taskdata.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/bitbake-dev/lib/bb/taskdata.py b/bitbake-dev/lib/bb/taskdata.py
index 782dfb0b78..64ab032c3c 100644
--- a/bitbake-dev/lib/bb/taskdata.py
+++ b/bitbake-dev/lib/bb/taskdata.py
@@ -340,7 +340,10 @@ class TaskData:
340 self.add_provider_internal(cfgData, dataCache, item) 340 self.add_provider_internal(cfgData, dataCache, item)
341 except bb.providers.NoProvider: 341 except bb.providers.NoProvider:
342 if self.abort: 342 if self.abort:
343 bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (item, self.get_dependees_str(item))) 343 if self.get_rdependees_str(item):
344 bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (item, self.get_dependees_str(item)))
345 else:
346 bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s'" % (item))
344 raise 347 raise
345 targetid = self.getbuild_id(item) 348 targetid = self.getbuild_id(item)
346 self.remove_buildtarget(targetid) 349 self.remove_buildtarget(targetid)
@@ -358,7 +361,10 @@ class TaskData:
358 return 361 return
359 362
360 if not item in dataCache.providers: 363 if not item in dataCache.providers:
361 bb.msg.note(2, bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (item, self.get_dependees_str(item))) 364 if self.get_rdependees_str(item):
365 bb.msg.note(2, bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (item, self.get_dependees_str(item)))
366 else:
367 bb.msg.note(2, bb.msg.domain.Provider, "Nothing PROVIDES '%s'" % (item))
362 bb.event.fire(bb.event.NoProvider(item, cfgData)) 368 bb.event.fire(bb.event.NoProvider(item, cfgData))
363 raise bb.providers.NoProvider(item) 369 raise bb.providers.NoProvider(item)
364 370
@@ -536,7 +542,10 @@ class TaskData:
536 except bb.providers.NoProvider: 542 except bb.providers.NoProvider:
537 targetid = self.getbuild_id(target) 543 targetid = self.getbuild_id(target)
538 if self.abort and targetid in self.external_targets: 544 if self.abort and targetid in self.external_targets:
539 bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (target, self.get_dependees_str(target))) 545 if self.get_rdependees_str(target):
546 bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (target, self.get_dependees_str(target)))
547 else:
548 bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s'" % (target))
540 raise 549 raise
541 self.remove_buildtarget(targetid) 550 self.remove_buildtarget(targetid)
542 for target in self.get_unresolved_run_targets(dataCache): 551 for target in self.get_unresolved_run_targets(dataCache):