keymaps: drop support for include files
authorGerd Hoffmann <kraxel@redhat.com>
Fri, 16 Nov 2018 10:43:19 +0000 (11:43 +0100)
committerGerd Hoffmann <kraxel@redhat.com>
Thu, 10 Jan 2019 07:55:31 +0000 (08:55 +0100)
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-id: 20181116104319.10329-5-kraxel@redhat.com

ui/keymaps.c

index 085889b555d976a3448f75923485321bdcdc9fa3..6e44f738eda9b09496b4e69437d4eed6fe262c8e 100644 (file)
@@ -115,10 +115,9 @@ static int parse_keyboard_layout(kbd_layout_t *k,
             continue;
         }
         if (!strncmp(line, "include ", 8)) {
-            if (parse_keyboard_layout(k, table, line + 8, errp) < 0) {
-                ret = -1;
-                goto out;
-            }
+            error_setg(errp, "keymap include files are not supported any more");
+            ret = -1;
+            goto out;
         } else {
             int offset = 0;
             while (line[offset] != 0 &&