sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

patch.py: fixed message domain errors 

The dynamic message domain was introduced by Richard Purdie with the following patch:
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=a6c48298b17e6a5844b3638b422fe226e3b67b89

(From OE-Core rev: 2383e06c8ed7c15aa148b9dbe40445e7095b6f57)

(From OE-Core rev: d104367903478613123c64df8d2a5188775d1f9d)

Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Samuel Stirtzel 2011-09-13 13:30:32 +02:00 committed by Richard Purdie
parent 90a4f95d3d
commit 7d30c2df87
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/lib/oe/patch.py
View File

@ -358,7 +358,7 @@ class UserResolver(Resolver):
t = bb.data.getVar('T', self.patchset.d, 1)
if not t:
bb.msg.fatal(bb.msg.domain.Build, "T not set")
bb.msg.fatal("Build", "T not set")
bb.utils.mkdirhier(t)
import random
rcfile = "%s/bashrc.%s.%s" % (t, str(os.getpid()), random.random())
@ -376,7 +376,7 @@ class UserResolver(Resolver):
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. " \
bb.msg.fatal("Build", ("Cannot proceed with manual patch resolution - '%s' not found. " \
+ "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
# Construct a new PatchSet after the user's changes, compare the