summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-01-19 13:59:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-19 14:34:34 +0000
commit11e5d7bc814a265d338dbb06d82e7533c2187be2 (patch)
tree5bafb67bdcad14bb22bd30f0784cc34d8a93778b /meta/classes
parentadb3ed29db5973d6b43a0217c4d8052d2ff722f8 (diff)
downloadpoky-11e5d7bc814a265d338dbb06d82e7533c2187be2.tar.gz
classes/patch: avoid backtrace when patch does not apply
We don't need to see a Python stack backtrace when a patch does not apply, just the error output from patch, so trap these kinds of errors and ensure that we display the message and fail the task and nothing else. Fixes [YOCTO #1143] (From OE-Core rev: ce6c80a1e68c2af0b4b5fa27582ad9c9f119e5c1) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/patch.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 471c32bce2..1ea4bc5e02 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -155,7 +155,10 @@ python patch_do_patch() {
155 patchset.Import({"file":local, "strippath": parm['striplevel']}, True) 155 patchset.Import({"file":local, "strippath": parm['striplevel']}, True)
156 except Exception as exc: 156 except Exception as exc:
157 bb.fatal(str(exc)) 157 bb.fatal(str(exc))
158 resolver.Resolve() 158 try:
159 resolver.Resolve()
160 except bb.BBHandledException as e:
161 bb.fatal(str(e))
159} 162}
160patch_do_patch[vardepsexclude] = "PATCHRESOLVE" 163patch_do_patch[vardepsexclude] = "PATCHRESOLVE"
161 164