diff options
Diffstat (limited to 'bitbake/lib/bb/data.py')
-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 2d04b010cd..96ed6e1e41 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): | |||
182 | if all: | 182 | if all: |
183 | oval = getVar(var, d, 0) | 183 | oval = getVar(var, d, 0) |
184 | val = getVar(var, d, 1) | 184 | val = getVar(var, d, 1) |
185 | except KeyboardInterrupt: | 185 | except (KeyboardInterrupt, bb.build.FuncFailed): |
186 | raise | 186 | raise |
187 | except: | 187 | except Exception, exc: |
188 | excname = str(sys.exc_info()[0]) | 188 | o.write('# expansion of %s threw %s: %s\n' % (var, exc.__class__.__name__, str(exc))) |
189 | if excname == "bb.build.FuncFailed": | ||
190 | raise | ||
191 | o.write('# expansion of %s threw %s\n' % (var, excname)) | ||
192 | return 0 | 189 | return 0 |
193 | 190 | ||
194 | if all: | 191 | if all: |