[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/6] grub-install: Fix inverted test for NLS enabled when copying
From: |
Daniel Kiper |
Subject: |
[PATCH 1/6] grub-install: Fix inverted test for NLS enabled when copying locales |
Date: |
Mon, 25 May 2020 21:02:10 +0200 |
From: Martin Whitaker <address@hidden>
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 <address@hidden>
Signed-off-by: Daniel Kiper <address@hidden>
---
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.11.0
- [PATCH 0/6] GRUB: Bundle of various fixes and cleanups, Daniel Kiper, 2020/05/25
- [PATCH 2/6] net/http: Return an error on HTTP error responses, Daniel Kiper, 2020/05/25
- [PATCH 6/6] efi/tpm: Fix typo in grub_efi_tpm2_protocol struct, Daniel Kiper, 2020/05/25
- [PATCH 4/6] tpm: Drop unneeded code, Daniel Kiper, 2020/05/25
- [PATCH 1/6] grub-install: Fix inverted test for NLS enabled when copying locales,
Daniel Kiper <=
- [PATCH 3/6] docs: Fix devicetree command description, Daniel Kiper, 2020/05/25
- [PATCH 5/6] i386/efi/init: Drop bogus include, Daniel Kiper, 2020/05/25