summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/data_smart.py2
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index fb8d9d5..d328400 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -143,6 +143,8 @@ class DataSmart(MutableMapping):
143 break 143 break
144 except ExpansionError: 144 except ExpansionError:
145 raise 145 raise
146 except bb.parse.SkipPackage:
147 raise
146 except Exception as exc: 148 except Exception as exc:
147 raise ExpansionError(varname, s, exc) 149 raise ExpansionError(varname, s, exc)
148 150
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index e6039e1..2ee8ebd 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -153,7 +153,12 @@ def handle(fn, d, include):
153 if ext != ".bbclass": 153 if ext != ".bbclass":
154 data.setVar('FILE', abs_fn, d) 154 data.setVar('FILE', abs_fn, d)
155 155
156 statements.eval(d) 156 try:
157 statements.eval(d)
158 except bb.parse.SkipPackage:
159 bb.data.setVar("__SKIPPED", True, d)
160 if include == 0:
161 return { "" : d }
157 162
158 if ext != ".bbclass" and include == 0: 163 if ext != ".bbclass" and include == 0:
159 return ast.multi_finalize(fn, d) 164 return ast.multi_finalize(fn, d)