summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-04-11 23:07:50 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-12 15:16:05 +0100
commitbf0fc2da669745d4a55101177a07b00ba9ac3c7d (patch)
tree99935f1ccc07b3435e4d55e56ca4ff81501ce039 /bitbake/lib/bb
parent000b7d3d1c6ca934e5e988f8c6682a996c82b587 (diff)
downloadpoky-bf0fc2da669745d4a55101177a07b00ba9ac3c7d.tar.gz
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 <nathan@nathanrossi.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/data.py2
-rw-r--r--bitbake/lib/bb/siggen.py2
2 files changed, 4 insertions, 0 deletions
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):
359 359
360 deps |= set((vardeps or "").split()) 360 deps |= set((vardeps or "").split())
361 deps -= set(varflags.get("vardepsexclude", "").split()) 361 deps -= set(varflags.get("vardepsexclude", "").split())
362 except bb.parse.SkipRecipe:
363 raise
362 except Exception as e: 364 except Exception as e:
363 bb.warn("Exception during build_dependencies for %s" % key) 365 bb.warn("Exception during build_dependencies for %s" % key)
364 raise 366 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):
157 157
158 try: 158 try:
159 taskdeps = self._build_data(fn, d) 159 taskdeps = self._build_data(fn, d)
160 except bb.parse.SkipRecipe:
161 raise
160 except: 162 except:
161 bb.warn("Error during finalise of %s" % fn) 163 bb.warn("Error during finalise of %s" % fn)
162 raise 164 raise