Patchwork [3/3] oe.patch: drop bb.msg.domain reference

login
register
mail settings
Submitter Christopher Larson
Date Oct. 7, 2011, 9:03 p.m.
Message ID <702d65b93492008812ac8778fc010f30e904383e.1318021323.git.kergoth@gmail.com>
Download mbox | patch
Permalink /patch/12949/
State New, archived
Headers show

Comments

Christopher Larson - Oct. 7, 2011, 9:03 p.m.
Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
 meta/lib/oe/patch.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Samuel Stirtzel - Oct. 10, 2011, 7:17 a.m.
Hi,
there was already a patch for this [1] (Yes I know, I should have
added more descriptions), according to the patch from Richard [2] the
message domain can be constructed dynamical now.
Since your patch seems a little bit different (dropping the message
domain completely) I can't tell if my resolution was inadequate.

For this patch I think it wouldn't make a big difference for the user,
feel free to apply the one that best suits in resolving the problem.


[1] http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009474.html
[2] http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=a6c48298b17e6a5844b3638b422fe226e3b67b89

2011/10/7 Christopher Larson <kergoth@gmail.com>:
> Signed-off-by: Christopher Larson <kergoth@gmail.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..9b0ff37 100644
> --- a/meta/lib/oe/patch.py
> +++ b/meta/lib/oe/patch.py
> @@ -376,8 +376,8 @@ 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. " \
> -                    + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
> +                bb.fatal(("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
>             # sets, checking patches for modifications, and doing a remote
> --
> 1.7.4.1
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Chris Larson - Oct. 10, 2011, 9:09 p.m.
On Mon, Oct 10, 2011 at 12:17 AM, Samuel Stirtzel
<s.stirtzel@googlemail.com> wrote:
> Hi,
> there was already a patch for this [1] (Yes I know, I should have
> added more descriptions), according to the patch from Richard [2] the
> message domain can be constructed dynamical now.
> Since your patch seems a little bit different (dropping the message
> domain completely) I can't tell if my resolution was inadequate.
>
> For this patch I think it wouldn't make a big difference for the user,
> feel free to apply the one that best suits in resolving the problem.
>
>
> [1] http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009474.html
> [2] http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=a6c48298b17e6a5844b3638b422fe226e3b67b89

Indeed, your version is superior.

For what it's worth, consider both of those patches of yours acked by
me. Getting useful error messages rather than python syntax errors is
rather important.

Patch

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 1406e19..9b0ff37 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -376,8 +376,8 @@  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. " \
-                    + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
+                bb.fatal(("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
             # sets, checking patches for modifications, and doing a remote