[PATCH 1/2] patch.py: fixed message domain errors

[PATCH 1/2] patch.py: fixed message domain errors

[Samuel Stirtzel]

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>
---
 meta/lib/oe/patch.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 1406e19..9768be0 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
-- 
1.7.4.1

[PATCH 2/2] data.py: fixed message domain errors

[Samuel Stirtzel]

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>
---
 meta/lib/oe/data.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/lib/oe/data.py b/meta/lib/oe/data.py
index 4b4d03e..af900be 100644
--- a/meta/lib/oe/data.py
+++ b/meta/lib/oe/data.py
@@ -15,4 +15,4 @@ def typed_value(key, d):
     try:
         return oe.maketype.create(d.getVar(key, True) or '', var_type, **flags)
     except (TypeError, ValueError), exc:
-        bb.msg.fatal(bb.msg.domain.Data, "%s: %s" % (key, str(exc)))
+        bb.msg.fatal("Data", "%s: %s" % (key, str(exc)))
-- 
1.7.4.1

Re: [PATCH 2/2] data.py: fixed message domain errors

[Richard Purdie]

On Tue, 2011-09-13 at 13:30 +0200, Samuel Stirtzel wrote:
> 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>
> ---
>  meta/lib/oe/data.py |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Patches 1 and 2 merged to master, thanks.

Sorry about the delay.

Richard