nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

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

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