]> code.ossystems Code Review - openembedded-core.git/commitdiff
patch.py: fixed message domain errors
authorSamuel Stirtzel <s.stirtzel@googlemail.com>
Tue, 13 Sep 2011 11:30:32 +0000 (13:30 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 14 Oct 2011 12:47:09 +0000 (13:47 +0100)
The dynamic message domain was introduced by Richard Purdie with the following patch:
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=a6c48298b17e6a5844b3638b422fe226e3b67b89

Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/patch.py

index 1406e1950c70efd4fd18e9a7bcfdcc6ae4e3ed53..9768be077fcd1c9e7c184986d3a937d009235270 100644 (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