[1921] * util/grub-mkconfig_lib.in (grub_warn): New function.

Revision: 1921
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1921
Author:   robertmh
Date:     2008-11-20 19:22:20 +0000 (Thu, 20 Nov 2008)

Log Message:
-----------
        * util/grub-mkconfig_lib.in (grub_warn): New function.
        (convert_system_path_to_grub_path): Use grub_warn() when issuing
        warnings, to obtain consistent formatting.
        * util/grub.d/00_header.in: Likewise.
        * util/update-grub_lib.in: Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub-mkconfig_lib.in
    trunk/grub2/util/grub.d/00_header.in
    trunk/grub2/util/update-grub_lib.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2008-11-20 18:07:10 UTC (rev 1920)
+++ trunk/grub2/ChangeLog	2008-11-20 19:22:20 UTC (rev 1921)
@@ -1,8 +1,14 @@
-2008-11-19  Robert Millan  <[email protected]>
+2008-11-20  Robert Millan  <[email protected]>
 
 	* kern/i386/coreboot/init.c (grub_time_tics): Remove variable.
 	(grub_get_rtc, grub_exit): Abort with grub_fatal() if called.
 
+	* util/grub-mkconfig_lib.in (grub_warn): New function.
+	(convert_system_path_to_grub_path): Use grub_warn() when issuing
+	warnings, to obtain consistent formatting.
+	* util/grub.d/00_header.in: Likewise.
+	* util/update-grub_lib.in: Likewise.
+
 2008-11-19  Robert Millan  <[email protected]>
 
 	* loader/i386/pc/linux.c (grub_rescue_cmd_initrd): Fix a typo.

Modified: trunk/grub2/util/grub-mkconfig_lib.in
===================================================================
--- trunk/grub2/util/grub-mkconfig_lib.in	2008-11-20 18:07:10 UTC (rev 1920)
+++ trunk/grub2/util/grub-mkconfig_lib.in	2008-11-20 19:22:20 UTC (rev 1921)
@@ -25,6 +25,11 @@
 
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 
+grub_warn ()
+{
+  echo "Warning: $@" >&2
+}
+
 make_system_path_relative_to_its_root ()
 {
   path=$1
@@ -107,7 +112,7 @@
 {
   path=$1
 
-  echo "Warning: convert_system_path_to_grub_path() is deprecated.  Use prepare_grub_to_access_device() instead." >&2
+  grub_warn "convert_system_path_to_grub_path() is deprecated.  Use prepare_grub_to_access_device() instead."
 
   # abort if GRUB can't access the path
   if is_path_readable_by_grub ${path} ; then : ; else

Modified: trunk/grub2/util/grub.d/00_header.in
===================================================================
--- trunk/grub2/util/grub.d/00_header.in	2008-11-20 18:07:10 UTC (rev 1920)
+++ trunk/grub2/util/grub.d/00_header.in	2008-11-20 19:22:20 UTC (rev 1921)
@@ -47,7 +47,7 @@
     fi
 
     if [ "x${GRUB_SERIAL_COMMAND}" = "x" ] ; then
-      echo "Warning, requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default parameters will be used." >&2
+      grub_warn "Requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default parameters will be used."
       GRUB_SERIAL_COMMAND=serial
     fi
     echo "${GRUB_SERIAL_COMMAND}"

Modified: trunk/grub2/util/update-grub_lib.in
===================================================================
--- trunk/grub2/util/update-grub_lib.in	2008-11-20 18:07:10 UTC (rev 1920)
+++ trunk/grub2/util/update-grub_lib.in	2008-11-20 19:22:20 UTC (rev 1921)
@@ -18,5 +18,6 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 
-echo "warning: update-grub_lib is deprecated, use grub-mkconfig_lib instead" >&2
 . ${libdir}/grub/grub-mkconfig_lib
+
+grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"