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 /meta/lib/oe/patch.py | |
parent | 453ee8d5737d90b0a17cf62c750d415080000a2d (diff) | |
download | poky-beef002bb4c23f105458b8a8ead2c8eec06eb829.tar.gz |
lib/oe/patch.py: Fix patch application failure interaction handling
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/lib/oe/patch.py')
-rw-r--r-- | meta/lib/oe/patch.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): | |||
373 | os.chmod(rcfile, 0775) | 373 | os.chmod(rcfile, 0775) |
374 | 374 | ||
375 | os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" | 375 | os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" |
376 | os.environ['TERMRCFILE'] = rcfile | 376 | os.environ['SHELLCMDS'] = "bash --rcfile " + rcfile |
377 | rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1)) | 377 | rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1)) |
378 | if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: | 378 | if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: |
379 | bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \ | 379 | bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \ |