mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

patch.py: fixed message domain errors

Browse Source 
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)

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 10c191bd65
commit fb8483e216
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/patch.py
+2 -2
View File
@@ -358,7 +358,7 @@ class UserResolver(Resolver):
t = bb.data.getVar('T', self.patchset.d, 1) t = bb.data.getVar('T', self.patchset.d, 1)
if not t: if not t:
bb.msg.fatal(bb.msg.domain.Build, "T not set") bb.msg.fatal("Build", "T not set")
bb.utils.mkdirhier(t) bb.utils.mkdirhier(t)
import random import random
rcfile = "%s/bashrc.%s.%s" % (t, str(os.getpid()), random.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 os.environ['SHELLCMDS'] = "bash --rcfile " + rcfile
rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1)) rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: 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)) + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
# Construct a new PatchSet after the user's changes, compare the # Construct a new PatchSet after the user's changes, compare the