diff options
Diffstat (limited to 'meta/lib/oe/patch.py')
-rw-r--r-- | meta/lib/oe/patch.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 6ab4427788..9d36172909 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -214,13 +214,17 @@ class PatchTree(PatchSet): | |||
214 | if not force: | 214 | if not force: |
215 | shellcmd.append('--dry-run') | 215 | shellcmd.append('--dry-run') |
216 | 216 | ||
217 | output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) | 217 | try: |
218 | output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) | ||
218 | 219 | ||
219 | if force: | 220 | if force: |
220 | return | 221 | return |
221 | 222 | ||
222 | shellcmd.pop(len(shellcmd) - 1) | 223 | shellcmd.pop(len(shellcmd) - 1) |
223 | output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) | 224 | output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) |
225 | except CmdError as err: | ||
226 | raise bb.BBHandledException("Applying '%s' failed:\n%s" % | ||
227 | (os.path.basename(patch['file']), err.output)) | ||
224 | 228 | ||
225 | if not reverse: | 229 | if not reverse: |
226 | self._appendPatchFile(patch['file'], patch['strippath']) | 230 | self._appendPatchFile(patch['file'], patch['strippath']) |