diff options
Diffstat (limited to 'lib/bb/parse')
-rw-r--r-- | lib/bb/parse/__init__.py | 7 | ||||
-rw-r--r-- | lib/bb/parse/ast.py | 6 | ||||
-rw-r--r-- | lib/bb/parse/parse_py/BBHandler.py | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/lib/bb/parse/__init__.py b/lib/bb/parse/__init__.py index bf5ed05e7..2303f15b9 100644 --- a/lib/bb/parse/__init__.py +++ b/lib/bb/parse/__init__.py @@ -49,8 +49,11 @@ class ParseError(Exception): else: return "ParseError in %s: %s" % (self.filename, self.msg) -class SkipPackage(Exception): - """Exception raised to skip this package""" +class SkipRecipe(Exception): + """Exception raised to skip this recipe""" + +class SkipPackage(SkipRecipe): + """Exception raised to skip this recipe (use SkipRecipe in new code)""" __mtime_cache = {} def cached_mtime(f): diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py index 30380a4bf..4e5a06e76 100644 --- a/lib/bb/parse/ast.py +++ b/lib/bb/parse/ast.py @@ -386,7 +386,7 @@ def multi_finalize(fn, d): d = bb.data.createCopy(safe_d) try: finalize(fn, d) - except bb.parse.SkipPackage as e: + except bb.parse.SkipRecipe as e: d.setVar("__SKIPPED", e.args[0]) datastores = {"": safe_d} @@ -429,7 +429,7 @@ def multi_finalize(fn, d): verfunc(pv, d, safe_d) try: finalize(fn, d) - except bb.parse.SkipPackage as e: + except bb.parse.SkipRecipe as e: d.setVar("__SKIPPED", e.args[0]) _create_variants(datastores, versions, verfunc, onlyfinalise) @@ -469,7 +469,7 @@ def multi_finalize(fn, d): try: if not onlyfinalise or variant in onlyfinalise: finalize(fn, variant_d, variant) - except bb.parse.SkipPackage as e: + except bb.parse.SkipRecipe as e: variant_d.setVar("__SKIPPED", e.args[0]) if len(datastores) > 1: diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py index a8627e9c0..9633340d1 100644 --- a/lib/bb/parse/parse_py/BBHandler.py +++ b/lib/bb/parse/parse_py/BBHandler.py @@ -154,7 +154,7 @@ def handle(fn, d, include): try: statements.eval(d) - except bb.parse.SkipPackage: + except bb.parse.SkipRecipe: bb.data.setVar("__SKIPPED", True, d) if include == 0: return { "" : d } |