Patchwork [bitbake-devel] cooker: adjust layer dependency error messages

login
register
mail settings
Submitter Paul Eggleton
Date Sept. 25, 2012, 3:25 p.m.
Message ID <1348586728-3148-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/37207/
State New
Headers show

Comments

Paul Eggleton - Sept. 25, 2012, 3:25 p.m.
Make these a little easier to understand.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 bitbake/lib/bb/cooker.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Richard Purdie - Sept. 27, 2012, 3:42 p.m.
On Tue, 2012-09-25 at 16:25 +0100, Paul Eggleton wrote:
> Make these a little easier to understand.
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  bitbake/lib/bb/cooker.py |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index b281cd0..7ca1ffd 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -939,13 +939,13 @@  class BBCooker:
                                         errors = True
                                         continue
                                     if lver <> depver:
-                                        parselog.error("Layer dependency %s of layer %s is at version %d, expected %d", dep, c, lver, depver)
+                                        parselog.error("Layer '%s' depends on version %d of layer '%s', but version %d is enabled in your configuration", c, depver, dep, lver)
                                         errors = True
                                 else:
-                                    parselog.error("Layer dependency %s of layer %s has no version, expected %d", dep, c, depver)
+                                    parselog.error("Layer '%s' depends on version %d of layer '%s', which exists in your configuration but does not specify a version", c, depver, dep)
                                     errors = True
                         else:
-                            parselog.error("Layer dependency %s of layer %s not found", dep, c)
+                            parselog.error("Layer '%s' depends on layer '%s', but this layer is not enabled in your configuration", c, dep)
                             errors = True
                     collection_depends[c] = depnamelist
                 else: