diff options
| author | Samuel Stirtzel <s.stirtzel@googlemail.com> | 2011-09-13 13:30:32 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-14 14:36:58 +0100 |
| commit | fb8483e216e8d24fb06b7deb09cc49525bcd2e0b (patch) | |
| tree | 2b25d93dbb051bb8cce7c7f7b371fa880a5f0131 /meta/lib | |
| parent | 10c191bd65ef3f6f92971a1fed9e340275d4a244 (diff) | |
| download | ast2050-yocto-poky-fb8483e216e8d24fb06b7deb09cc49525bcd2e0b.zip ast2050-yocto-poky-fb8483e216e8d24fb06b7deb09cc49525bcd2e0b.tar.gz | |
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 <s.stirtzel@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | 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 |
