Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2012-09-25 09:46:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-23
21:04:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2012-09-25
09:46:40.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Sep 21 07:37:53 UTC 2012 - mch...@suse.com
+
+- grub2-fix-locale-en.mo.gz-not-found-error-message.patch (bnc#771393)
+
+-------------------------------------------------------------------
New:
----
grub2-fix-locale-en.mo.gz-not-found-error-message.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.OlNjRl/_old 2012-09-25 09:47:45.000000000 +0200
+++ /var/tmp/diff_new_pack.OlNjRl/_new 2012-09-25 09:47:45.000000000 +0200
@@ -96,6 +96,7 @@
Patch15: not-display-menu-when-boot-once.patch
Patch16: grub2-fix-Grub2-with-SUSE-Xen-package-install.patch
Patch17: grub2-pass-corret-root-for-nfsroot.patch
+Patch18: grub2-fix-locale-en.mo.gz-not-found-error-message.patch
Patch99: use-grub2-efi-as-a-package-name.patch
PreReq: perl-Bootloader
Requires: gettext-runtime
@@ -164,6 +165,7 @@
%patch15 -p1
%patch16 -p1
%patch17 -p1
+%patch18 -p1
cd ..
# README.openSUSE
++++++ grub2-fix-locale-en.mo.gz-not-found-error-message.patch ++++++
>From d01cc563e1f766ecb9c255438ee49b4d31432dc0 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
References: bnc#771393
Patch-Mainline: no
We don't insert gettext module if message catalog file missing to
prevent error message from being logged.
---
util/grub.d/00_header.in | 10 +++++++---
1 files changed, 7 insertions(+), 3 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
# 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
--
1.7.3.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
