diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-11 11:45:42 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-11 11:45:42 +0000 |
| commit | 500967160d58626953ec52c4f927445aed6150b2 (patch) | |
| tree | 361469947bc3c0dba9cddde3106a69aafdeb4c47 | |
| parent | 2e2348dbf283fe186a7e45a4823b56fed70d47f0 (diff) | |
devshell.bbclass, patch.bbclass: Error on any non-zero rc from TERMCMD*.
* Suggested by Richard Purdie.
* Closes #2274.
| -rw-r--r-- | classes/devshell.bbclass | 2 | ||||
| -rw-r--r-- | classes/patch.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/devshell.bbclass b/classes/devshell.bbclass index 09ce100fc4..35456b517b 100644 --- a/classes/devshell.bbclass +++ b/classes/devshell.bbclass @@ -6,7 +6,7 @@ do_devshell[nostamp] = "1" devshell_do_devshell() { export TERMWINDOWTITLE="Bitbake Developer Shell" ${TERMCMD} - if [ $? -eq 127 ]; then + if [ $? -ne 0 ]; then echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable." exit 1 fi diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 7a5dcac57a..12657fa0f6 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -377,7 +377,7 @@ def patch_init(d): os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" os.environ['TERMRCFILE'] = rcfile rc = os.system(bb.data.getVar('TERMCMDRUN', d, 1)) - if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) == 127: + if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \ + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', d, 1)) |