devshell.bbclass, patch.bbclass: Error on any non-zero rc from TERMCMD*.

* Suggested by Richard Purdie.
* Closes #2274.

diff --git a/classes/devshell.bbclass b/classes/devshell.bbclass
index 09ce100..35456b5 100644 (file)
--- 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 7a5dcac..12657fa 100644 (file)
--- 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))