Skip to contentSkip to conversation

lib/bb/data.py: improve output for expansion errors

PATCH Applied Paul Eggleton 2 participants 2 messages Sep 25, 2012 – Sep 27, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/bb/data.py: improve output for expansion errors

Instead of logging the function/variable separately as a NOTE when failing to expand, re-raise ExpansionError with more contextual information. This means that the full details are reported in Hob as well as actually reporting the original error message in any UI where we previously did not. For example, we used to get this with tab/space indentation issues in a python function:

NOTE: Error expanding variable populate_packages
ERROR: Unable to parse /path/to/recipename.bb

Now, we will get this:

ERROR: ExpansionError during parsing /path/to/recipename.bb: Failure
expanding variable populate_packages: IndentationError: unindent does not match any outer indentation level (<string>, line 4)

Fixes [YOCTO #3162].

---
 bitbake/lib/bb/data.py       |    5 ++---
 bitbake/lib/bb/data_smart.py |    5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)
bitbake/lib/bb/data.py +2 -3
index 5b7a092..9a32353 100644
@@ -323,9 +323,8 @@ def build_dependencies(key, keys, shelldeps, vardepvals, d):
 
         deps |= set((vardeps or "").split())
         deps -= set((d.getVarFlag(key, "vardepsexclude", True) or "").split())
-    except:
-        bb.note("Error expanding variable %s" % key)
-        raise
+    except Exception as e:
+        raise bb.data_smart.ExpansionError(key, None, e)
     return deps, value
     #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs)))
     #d.setVarFlag(key, "vardeps", deps)
bitbake/lib/bb/data_smart.py +4 -1
index f5f3b13..ec3c04e 100644
@@ -103,7 +103,10 @@ class ExpansionError(Exception):
         self.variablename = varname
         self.exception = exception
         if varname:
-            self.msg = "Failure expanding variable %s, expression was %s which triggered exception %s: %s" % (varname, expression, type(exception).__name__, exception)
+            if expression:
+                self.msg = "Failure expanding variable %s, expression was %s which triggered exception %s: %s" % (varname, expression, type(exception).__name__, exception)
+            else:
+                self.msg = "Failure expanding variable %s: %s: %s" % (varname, type(exception).__name__, exception)
         else:
             self.msg = "Failure expanding expression %s which triggered exception %s: %s" % (expression, type(exception).__name__, exception)
         Exception.__init__(self, self.msg)
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 16 lines · Paul Eggleton

Instead of logging the function/variable separately as a NOTE when failing to expand, re-raise ExpansionError with more contextual information. This means that the full details are reported in Hob as well as actually reporting the original error message in any UI where we previously did not. For example, we used to get this with tab/space indentation issues in a python function:

NOTE: Error expanding variable populate_packages
ERROR: Unable to parse /path/to/recipename.bb

Now, we will get this:

ERROR: ExpansionError during parsing /path/to/recipename.bb: Failure
expanding variable populate_packages: IndentationError: unindent does not match any outer indentation level (<string>, line 4)

Quoted 7 lines

Fixes [YOCTO #3162].

---
 bitbake/lib/bb/data.py       |    5 ++---
 bitbake/lib/bb/data_smart.py |    5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

Merged to master, thanks.

Richard