[oe-commits] org.oe.dev devshell.bbclass, patch.bbclass: Error on any non-zero rc from TERMCMD*.

[pfalcon commit]

devshell.bbclass, patch.bbclass: Error on any non-zero rc from TERMCMD*.
* Suggested by Richard Purdie.
* Closes #2274.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 1bb8268fd7793fa7cde34e0d086742cc7a98a639
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1bb8268fd7793fa7cde34e0d086742cc7a98a639
Files:
1
classes/devshell.bbclass
classes/patch.bbclass
Diffs:

#
# mt diff -r5d2b69c4ad9d11aeba59c72e09e26d13e0f0e9e2 -r1bb8268fd7793fa7cde34e0d086742cc7a98a639
#
# 
# 
# patch "classes/devshell.bbclass"
#  from [fb590b758bd7179a87a43fee743af948955aca52]
#    to [778ca888b6de0136d3c80ac91d2fdef0d979e664]
# 
# patch "classes/patch.bbclass"
#  from [fb1cd70f6a56bd5677dbd637713601922bca2a1d]
#    to [501ddb8911d7ccbf0fec063727781c8a4647692a]
# 
============================================================
--- classes/devshell.bbclass	fb590b758bd7179a87a43fee743af948955aca52
+++ classes/devshell.bbclass	778ca888b6de0136d3c80ac91d2fdef0d979e664
@@ -6,7 +6,7 @@ devshell_do_devshell() {
 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
============================================================
--- classes/patch.bbclass	fb1cd70f6a56bd5677dbd637713601922bca2a1d
+++ classes/patch.bbclass	501ddb8911d7ccbf0fec063727781c8a4647692a
@@ -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))