[oe-commits] org.oe.dev devshell.bbclass, patch.bbclass: Check exit code of TERMCMD* commands to see if they were found at all.

[pfalcon commit]

devshell.bbclass, patch.bbclass: Check exit code of TERMCMD* commands to see if they were found at all.
* Fixes #2274.

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

#
# mt diff -r5ae61fd4def2a2a2fb4ff032dcc351c33f111256 -r5d2b69c4ad9d11aeba59c72e09e26d13e0f0e9e2
#
# 
# 
# patch "classes/devshell.bbclass"
#  from [ad428a97132e45ce98ab989da39f89beb8ceb5be]
#    to [fb590b758bd7179a87a43fee743af948955aca52]
# 
# patch "classes/patch.bbclass"
#  from [7682491b44fa64bf586c254fee44ea241be759c1]
#    to [fb1cd70f6a56bd5677dbd637713601922bca2a1d]
# 
============================================================
--- classes/devshell.bbclass	ad428a97132e45ce98ab989da39f89beb8ceb5be
+++ classes/devshell.bbclass	fb590b758bd7179a87a43fee743af948955aca52
@@ -6,6 +6,10 @@ devshell_do_devshell() {
 devshell_do_devshell() {
 	export TERMWINDOWTITLE="Bitbake Developer Shell"
 	${TERMCMD}
+	if [ $? -eq 127 ]; then
+	    echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."
+	    exit 1
+	fi
 }
 addtask devshell after do_patch
 
============================================================
--- classes/patch.bbclass	7682491b44fa64bf586c254fee44ea241be759c1
+++ classes/patch.bbclass	fb1cd70f6a56bd5677dbd637713601922bca2a1d
@@ -376,7 +376,10 @@ def patch_init(d):
  
  				os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually"
  				os.environ['TERMRCFILE'] = rcfile
- 				os.system(bb.data.getVar('TERMCMDRUN', d, 1))
+ 				rc = os.system(bb.data.getVar('TERMCMDRUN', d, 1))
+				if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) == 127:
+ 					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))
 
 				# Construct a new PatchSet after the user's changes, compare the
 				# sets, checking patches for modifications, and doing a remote