From 394ffc1d979d47d6ec4c0419ea13e98e1b781bd5 Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Thu, 5 Jul 2012 10:28:56 +0200

Subject: [PATCH] i18n/module-setup.sh: s/error/info if no keymap is

 configured

https://bugzilla.redhat.com/show_bug.cgi?id=836418

---

 modules.d/10i18n/module-setup.sh |   11 +++++++----

 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh

index a7ddc82..a1cf1c8 100755

--- a/modules.d/10i18n/module-setup.sh

+++ b/modules.d/10i18n/module-setup.sh

@@ -74,9 +74,11 @@ install() {

             for map in ${item[1]//,/ }

             do

                 map=(${map//-/ })

-                value=$(grep "^${map[0]}=" "${item[0]}")

-                value=${value#*=}

-                echo "${map[1]:-${map[0]}}=${value}"

+                if [[ -f "${item[0]}" ]]; then

+                    value=$(grep "^${map[0]}=" "${item[0]}")

+                    value=${value#*=}

+                    echo "${map[1]:-${map[0]}}=${value}"

+                fi

             done

         done

     }

@@ -155,9 +157,10 @@ install() {

         EXT_KEYMAPS+=\ ${UNIKEYMAP}\ ${GRP_TOGGLE}

         [[ ${KEYMAP} ]] || {

-            derror 'No KEYMAP.'

+            dinfo 'No KEYMAP configured.'

             return 1

         }

+

         findkeymap ${KEYMAP}

         for map in ${EXT_KEYMAPS}