lib/oe/patch.py: Fix patch application failure interaction handling
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
453ee8d573
commit
beef002bb4
|
@ -521,8 +521,7 @@ SRC_URI = "file://${FILE}"
|
||||||
# UI/Interaction Configuration
|
# UI/Interaction Configuration
|
||||||
##################################################################
|
##################################################################
|
||||||
|
|
||||||
SHELLRCCMD = "bash --rcfile $TERMRCFILE"
|
export SHELLCMDS = "bash"
|
||||||
export SHELLCMDS = "${SHELLRCCMD}"
|
|
||||||
# Some common terminal programs to choose from
|
# Some common terminal programs to choose from
|
||||||
GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"'
|
GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"'
|
||||||
GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS'
|
GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS'
|
||||||
|
|
|
@ -373,7 +373,7 @@ class UserResolver(Resolver):
|
||||||
os.chmod(rcfile, 0775)
|
os.chmod(rcfile, 0775)
|
||||||
|
|
||||||
os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually"
|
os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually"
|
||||||
os.environ['TERMRCFILE'] = rcfile
|
os.environ['SHELLCMDS'] = "bash --rcfile " + rcfile
|
||||||
rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
|
rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
|
||||||
if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0:
|
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. " \
|
bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \
|
||||||
|
|
Loading…
Reference in New Issue