nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

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

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