From 3291354991b9217216511d018cfe0427f7f311aa3f366e9b75ed8b5f95d44109 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sun, 7 Oct 2012 17:00:03 +0000
Subject: [PATCH] Accepting request 137371 from devel:openSUSE:Factory

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/137371
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=46
---
 ...ale-en.mo.gz-not-found-error-message.patch | 53 +++++++++----------
 grub2.changes                                 |  7 +++
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/grub2-fix-locale-en.mo.gz-not-found-error-message.patch b/grub2-fix-locale-en.mo.gz-not-found-error-message.patch
index 0d99d23..a2dd1c4 100644
--- a/grub2-fix-locale-en.mo.gz-not-found-error-message.patch
+++ b/grub2-fix-locale-en.mo.gz-not-found-error-message.patch
@@ -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 <mchang@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 <cjwatson@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 <mchang@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
diff --git a/grub2.changes b/grub2.changes
index 2d84aa2..3a6f160 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 26 08:04:48 UTC 2012 - mchang@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)
+
 -------------------------------------------------------------------
 Fri Sep 21 07:37:53 UTC 2012 - mchang@suse.com