diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-05-14 11:05:55 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-05-14 11:05:55 +0000 |
| commit | 1bfd0edf896c59eff20073addae968457df1b3a9 (patch) | |
| tree | ca2e4306d46aa83d111dd3bd90521db079f4953a /classes/patch.bbclass | |
| parent | 301a2db4b096c81c2a5da6b4064f5c781ad1aae7 (diff) | |
| parent | 45de1cf1e067ad5b61e7da0c8bd17adce13298ae (diff) | |
merge of '3010c8d9b229ee097f809082df8fa23835ce261f'
and 'e173605c3b1c2fe06e8a3d500f54d0d06a15896b'
Diffstat (limited to 'classes/patch.bbclass')
| -rw-r--r-- | classes/patch.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 84cca7f5a0..12657fa0f6 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -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) != 0: + 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 |