File 0001-grub-install-Fix-inverted-test-for-NLS-ena... of Package grub2

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-grub-install-Fix-inverted-test-for-NLS-enabled-when-.patch of Package grub2 (Revision 803450abf8233522a169f3c4ed07abf3)

Currently displaying revision 803450abf8233522a169f3c4ed07abf3 , Show latest

From e3067804dcec630f8715cec0a0755ba38e397bc0 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <fsf@martin-whitaker.me.uk>
Date: Mon, 25 May 2020 21:02:10 +0200
Subject: [PATCH] grub-install: Fix inverted test for NLS enabled when
 copying locales

Commit 3d8439da8 (grub-install: Locale depends on nls) attempted to avoid
copying locale files to the target directory when NLS was disabled.
However the test is inverted, and it does the opposite.

Signed-off-by: Martin Whitaker <fsf@martin-whitaker.me.uk>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
---
 util/grub-install-common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/grub-install-common.c b/util/grub-install-common.c
index ca0ac612a..f53bf0694 100644
--- a/util/grub-install-common.c
+++ b/util/grub-install-common.c
@@ -598,7 +598,7 @@ copy_all (const char *srcd,
   grub_util_fd_closedir (d);
 }
 
-#if !(defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
+#if (defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
 static const char *
 get_localedir (void)
 {
@@ -659,7 +659,7 @@ static void
 grub_install_copy_nls(const char *src __attribute__ ((unused)),
                       const char *dst __attribute__ ((unused)))
 {
-#if !(defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
+#if (defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
   char *dst_locale;
 
   dst_locale = grub_util_path_concat (2, dst, "locale");
-- 
2.31.1

Places

File 0001-grub-install-Fix-inverted-test-for-NLS-enabled-when-.patch of Package grub2 (Revision 803450abf8233522a169f3c4ed07abf3)

Places