From beef002bb4c23f105458b8a8ead2c8eec06eb829 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 10 Jun 2010 20:22:41 +0100 Subject: lib/oe/patch.py: Fix patch application failure interaction handling Signed-off-by: Richard Purdie --- meta/lib/oe/patch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index c1d616e66..94c56bc10 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. " \ -- cgit v1.2.3