nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

Blame SOURCES/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch

f725e3
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
f725e3
From: Vladimir Serbinenko <phcoder@gmail.com>
f725e3
Date: Wed, 29 Jan 2014 23:41:48 +0100
f725e3
Subject: [PATCH] * util/grub-mkfont.c: Downgrade warnings about unhandled
f725e3
 features to debug.
f725e3
f725e3
---
f725e3
 util/grub-mkfont.c | 14 ++++++++------
f725e3
 ChangeLog          |  9 +++++++++
f725e3
 2 files changed, 17 insertions(+), 6 deletions(-)
f725e3
f725e3
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
f725e3
index 3cb02ad5c45..3de07ee9c06 100644
f725e3
--- a/util/grub-mkfont.c
f725e3
+++ b/util/grub-mkfont.c
f725e3
@@ -516,8 +516,8 @@ process_cursive (struct gsub_feature *feature,
f725e3
 	}		      
f725e3
       if (grub_be_to_cpu16 (lookup->flag) & ~GSUB_RTL_CHAR)
f725e3
 	{
f725e3
-	  printf (_("Unsupported substitution flag: 0x%x\n"),
f725e3
-		  grub_be_to_cpu16 (lookup->flag));
f725e3
+	  grub_util_info ("unsupported substitution flag: 0x%x",
f725e3
+			  grub_be_to_cpu16 (lookup->flag));
f725e3
 	}
f725e3
       switch (feattag)
f725e3
 	{
f725e3
@@ -577,7 +577,8 @@ process_cursive (struct gsub_feature *feature,
f725e3
 	       There are 2 coverage specifications: list and range.
f725e3
 	       This warning is thrown when another coverage specification
f725e3
 	       is detected.  */
f725e3
-	    printf (_("Unsupported coverage specification: %d\n"), covertype);
f725e3
+	    fprintf (stderr,
f725e3
+		     _("Unsupported coverage specification: %d\n"), covertype);
f725e3
 	}
f725e3
     }
f725e3
 }
f725e3
@@ -616,7 +617,8 @@ add_font (struct grub_font_info *font_info, FT_Face face, int nocut)
f725e3
 	  grub_uint32_t feattag
f725e3
 	    = grub_be_to_cpu32 (features->features[i].feature_tag);
f725e3
 	  if (feature->params)
f725e3
-	    printf (_("WARNING: unsupported font feature parameters: %x\n"),
f725e3
+	    fprintf (stderr,
f725e3
+		     _("WARNING: unsupported font feature parameters: %x\n"),
f725e3
 		    grub_be_to_cpu16 (feature->params));
f725e3
 	  switch (feattag)
f725e3
 	    {
f725e3
@@ -647,8 +649,8 @@ add_font (struct grub_font_info *font_info, FT_Face face, int nocut)
f725e3
 		  if (!grub_isgraph (str[j]))
f725e3
 		    str[j] = '?';
f725e3
 		/* TRANSLATORS: It's gsub feature, not gsub font.  */
f725e3
-		printf (_("Unknown gsub font feature 0x%x (%s)\n"),
f725e3
-			feattag, str);
f725e3
+		grub_util_info ("Unknown gsub font feature 0x%x (%s)",
f725e3
+				feattag, str);
f725e3
 	      }
f725e3
 	    }
f725e3
 	}
f725e3
diff --git a/ChangeLog b/ChangeLog
f725e3
index a49f5f1f48f..9837c7f8d38 100644
f725e3
--- a/ChangeLog
f725e3
+++ b/ChangeLog
f725e3
@@ -1,3 +1,12 @@
f725e3
+2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
f725e3
+
f725e3
+	* util/grub-mkfont.c: Downgrade warnings about unhandled features
f725e3
+	to debug.
f725e3
+
f725e3
+2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
f725e3
+
f725e3
+	* grub-core/term/at_keyboard.c: Tolerate missing keyboard.
f725e3
+
f725e3
 2014-01-29  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
f725e3
 
f725e3
 	* .gitignore: add missing files and .exe variants.