diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-04-20 15:56:20 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:34 +0100 |
commit | 8bc7ebb4aece51cc4e4649449afa482a51580147 (patch) | |
tree | 78a4edcb36ea58968d3d956a9c3ac2c716271f8f | |
parent | 1e7a03cb580eb722a85297d6ffcbf55716e938d5 (diff) | |
download | openembedded-core-8bc7ebb4aece51cc4e4649449afa482a51580147.tar.gz openembedded-core-8bc7ebb4aece51cc4e4649449afa482a51580147.tar.bz2 openembedded-core-8bc7ebb4aece51cc4e4649449afa482a51580147.tar.xz openembedded-core-8bc7ebb4aece51cc4e4649449afa482a51580147.zip |
Enhance the expansion exception message
(Bitbake rev: 1cc11164a85a5b30d6b9184cb5a8f7f7ac1aaff2)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | bitbake/lib/bb/data.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 2d04b010c..96ed6e1e4 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -182,13 +182,10 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): if all: oval = getVar(var, d, 0) val = getVar(var, d, 1) - except KeyboardInterrupt: + except (KeyboardInterrupt, bb.build.FuncFailed): raise - except: - excname = str(sys.exc_info()[0]) - if excname == "bb.build.FuncFailed": - raise - o.write('# expansion of %s threw %s\n' % (var, excname)) + except Exception, exc: + o.write('# expansion of %s threw %s: %s\n' % (var, exc.__class__.__name__, str(exc))) return 0 if all: |