diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-10 20:22:41 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-10 20:22:41 +0100 |
| commit | beef002bb4c23f105458b8a8ead2c8eec06eb829 (patch) | |
| tree | 894f6311d0e2e7afdeb57f9f38174e31565baca5 | |
| parent | 453ee8d5737d90b0a17cf62c750d415080000a2d (diff) | |
| download | openembedded-core-beef002bb4c23f105458b8a8ead2c8eec06eb829.tar.gz openembedded-core-beef002bb4c23f105458b8a8ead2c8eec06eb829.tar.bz2 openembedded-core-beef002bb4c23f105458b8a8ead2c8eec06eb829.zip | |
lib/oe/patch.py: Fix patch application failure interaction handling
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/conf/bitbake.conf | 3 | ||||
| -rw-r--r-- | meta/lib/oe/patch.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index ad1afad30d..9d8e59457c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -521,8 +521,7 @@ SRC_URI = "file://${FILE}" # UI/Interaction Configuration ################################################################## -SHELLRCCMD = "bash --rcfile $TERMRCFILE" -export SHELLCMDS = "${SHELLRCCMD}" +export SHELLCMDS = "bash" # Some common terminal programs to choose from GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"' GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS' diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index c1d616e668..94c56bc101 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -373,7 +373,7 @@ class UserResolver(Resolver): os.chmod(rcfile, 0775) 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)) 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. " \ |