From fb8483e216e8d24fb06b7deb09cc49525bcd2e0b Mon Sep 17 00:00:00 2001 From: Samuel Stirtzel Date: Tue, 13 Sep 2011 13:30:32 +0200 Subject: 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) Signed-off-by: Samuel Stirtzel Signed-off-by: Richard Purdie --- meta/lib/oe/patch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 1406e1950c..9768be077f 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -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 -- cgit v1.2.3-54-g00ecf