Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2012-10-07 19:00:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2012-09-25 09:46:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2012-10-07 19:00:07.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 26 08:04:48 UTC 2012 - mch...@suse.com + +- refresh grub2-fix-locale-en.mo.gz-not-found-error-message.patch + with the correct fix in upstream bugzilla #35880 by Colin Watson + (bnc#771393) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2-fix-locale-en.mo.gz-not-found-error-message.patch ++++++ --- /var/tmp/diff_new_pack.nwQtOB/_old 2012-10-07 19:00:08.000000000 +0200 +++ /var/tmp/diff_new_pack.nwQtOB/_new 2012-10-07 19:00:08.000000000 +0200 @@ -1,38 +1,37 @@ -From d01cc563e1f766ecb9c255438ee49b4d31432dc0 Mon Sep 17 00:00:00 2001 +From e7500166b343874447e6abf385a791998c77f4c4 Mon Sep 17 00:00:00 2001 From: Michael Chang <mch...@suse.com> -Date: Fri, 21 Sep 2012 15:25:56 +0800 -Subject: [PATCH] Fix /grub2/locale/en.mo.gz not found error message +Date: Wed, 26 Sep 2012 15:55:44 +0800 +Subject: [PATCH] Silence error messages when translations are unavailable + +From: Colin Watson <cjwat...@ubuntu.com> References: bnc#771393 + https://savannah.gnu.org/bugs/?35880 Patch-Mainline: no -We don't insert gettext module if message catalog file missing to -prevent error message from being logged. +Signed-off-by: Michael Chang <mch...@suse.com> --- - util/grub.d/00_header.in | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) + grub-core/gettext/gettext.c | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) -diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index bb34ef2..d438d52 100644 ---- a/util/grub.d/00_header.in -+++ b/util/grub.d/00_header.in -@@ -182,10 +182,14 @@ EOF +diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c +index 569f985..eb4bb5d 100644 +--- a/grub-core/gettext/gettext.c ++++ b/grub-core/gettext/gettext.c +@@ -412,6 +412,14 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx, - # Gettext variables and module - if [ "x${LANG}" != "xC" ] ; then -+# We don't insert gettext module if message catalog file missing -+# To prevent error message from being logged (bnc#771393) - cat << EOF -- set locale_dir=\$prefix/locale -- set lang=${grub_lang} -- insmod gettext -+ if [ -f "\$prefix/locale/${grub_lang}.mo" ] ; then -+ set locale_dir=\$prefix/locale -+ set lang=${grub_lang} -+ insmod gettext -+ fi - EOF - fi + grub_free (lang); + } ++ ++ /* If no translations are available, fall back to untranslated text. */ ++ if (err == GRUB_ERR_FILE_NOT_FOUND) ++ { ++ grub_errno = GRUB_ERR_NONE; ++ return 0; ++ } ++ + return err; + } -- 1.7.3.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
