diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-06 13:16:13 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-06 13:16:13 +0000 |
| commit | ffdec425bfb26e152d1da5824a36dfe1fe72cd92 (patch) | |
| tree | 38a5233e01e62d57964dbb0bf38ca88a92049386 /bitbake-dev/lib/bb/taskdata.py | |
| parent | 4be017e82fdfbfbe1bf484bf745e770d18417918 (diff) | |
| download | openembedded-core-ffdec425bfb26e152d1da5824a36dfe1fe72cd92.tar.gz openembedded-core-ffdec425bfb26e152d1da5824a36dfe1fe72cd92.tar.bz2 openembedded-core-ffdec425bfb26e152d1da5824a36dfe1fe72cd92.tar.xz openembedded-core-ffdec425bfb26e152d1da5824a36dfe1fe72cd92.zip | |
bitbake/bitbake-dev: Sync with upstream
Diffstat (limited to 'bitbake-dev/lib/bb/taskdata.py')
| -rw-r--r-- | bitbake-dev/lib/bb/taskdata.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/bitbake-dev/lib/bb/taskdata.py b/bitbake-dev/lib/bb/taskdata.py index 782dfb0b7..64ab032c3 100644 --- a/bitbake-dev/lib/bb/taskdata.py +++ b/bitbake-dev/lib/bb/taskdata.py @@ -340,7 +340,10 @@ class TaskData: self.add_provider_internal(cfgData, dataCache, item) except bb.providers.NoProvider: if self.abort: - bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (item, self.get_dependees_str(item))) + if self.get_rdependees_str(item): + bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (item, self.get_dependees_str(item))) + else: + bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s'" % (item)) raise targetid = self.getbuild_id(item) self.remove_buildtarget(targetid) @@ -358,7 +361,10 @@ class TaskData: return if not item in dataCache.providers: - 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))) + if self.get_rdependees_str(item): + 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))) + else: + bb.msg.note(2, bb.msg.domain.Provider, "Nothing PROVIDES '%s'" % (item)) bb.event.fire(bb.event.NoProvider(item, cfgData)) raise bb.providers.NoProvider(item) @@ -536,7 +542,10 @@ class TaskData: except bb.providers.NoProvider: targetid = self.getbuild_id(target) if self.abort and targetid in self.external_targets: - bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (target, self.get_dependees_str(target))) + if self.get_rdependees_str(target): + bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (target, self.get_dependees_str(target))) + else: + bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s'" % (target)) raise self.remove_buildtarget(targetid) for target in self.get_unresolved_run_targets(dataCache): |