From bf0fc2da669745d4a55101177a07b00ba9ac3c7d Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 11 Apr 2017 23:07:50 +1000 Subject: [PATCH] bitbake: lib/bb/{data, siggen}: Don't warn on SkipRecipe exceptions Recipes/variables that raise a SkipRecipe exception are intentionally skipped, and should not generate warnings. [YOCTO #11319] (Bitbake rev: edf6e6094a9f7ad4b2ba06eef8fd34756edbedce) Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 2 ++ bitbake/lib/bb/siggen.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 0403754dee..134afaacc9 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -359,6 +359,8 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): deps |= set((vardeps or "").split()) deps -= set(varflags.get("vardepsexclude", "").split()) + except bb.parse.SkipRecipe: + raise except Exception as e: bb.warn("Exception during build_dependencies for %s" % key) raise diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 25ad3e9165..169756e254 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -157,6 +157,8 @@ class SignatureGeneratorBasic(SignatureGenerator): try: taskdeps = self._build_data(fn, d) + except bb.parse.SkipRecipe: + raise except: bb.warn("Error during finalise of %s" % fn) raise