Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jdINP-0005DD-1C for mharc-grub-devel@gnu.org; Mon, 25 May 2020 15:03:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdINM-00056z-7F for grub-devel@gnu.org; Mon, 25 May 2020 15:03:04 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:56654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdINK-0000Z8-Ui for grub-devel@gnu.org; Mon, 25 May 2020 15:03:03 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 04PJ1hed008082; Mon, 25 May 2020 19:02:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=0jyHiSVIUMJzxlg8EvKIAEhvO4N0Q+Fj2snBnZLPPJs=; b=F+a0wX6F2Mnb4PZs0DXki3wLFgNnWdJY+F8k0nd6Kzm1gPUDIWNoXSymYBMfjdqSHMrF OyokLLXbjIP9Ht6JfDVCywci6MsY3b6TDNqIxY9WxoJWAVuitrrqFo8xyXFkmwv6qxFe 1XBb+MaHVUvpK3+1vyQjf00XoRI4C56AFdOuYEDUaiwSruOw6BAxYK3OcYbTvZ2Eobci d+yEipB7P7VOk+QBSRJPPIa/lSa5bt9RzHTVDEkNjl2waTknKhS3bsnEWEdKWMxZEWQp uLZgOgQ+5CMWn4JjIhtlFAzOOBJOFzZVTAcPKXKu8KcGuDuhJ4+Q6oatxW8j5xZqc84O Kw== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2120.oracle.com with ESMTP id 316vfn6dtd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 25 May 2020 19:02:57 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 04PJ2t0r119104; Mon, 25 May 2020 19:02:56 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3030.oracle.com with ESMTP id 317ddmmg5a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 May 2020 19:02:56 +0000 Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 04PJ2fGD020230; Mon, 25 May 2020 19:02:46 GMT Received: from tomti.i.net-space.pl (/10.175.171.6) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 25 May 2020 12:02:41 -0700 From: Daniel Kiper To: grub-devel@gnu.org Cc: cjwatson@ubuntu.com, higgi1pt@gmail.com, javierm@redhat.com, fsf@martin-whitaker.me.uk, mailing-lists@martin-whitaker.me.uk, mjg59@srcf.ucam.org, olaf@aepfle.de, phcoder@gmail.com Subject: [PATCH 1/6] grub-install: Fix inverted test for NLS enabled when copying locales Date: Mon, 25 May 2020 21:02:10 +0200 Message-Id: <20200525190215.16390-2-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200525190215.16390-1-daniel.kiper@oracle.com> References: <20200525190215.16390-1-daniel.kiper@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9632 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 mlxscore=0 phishscore=0 adultscore=0 suspectscore=1 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2005250151 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9632 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 clxscore=1015 priorityscore=1501 mlxscore=0 malwarescore=0 spamscore=0 impostorscore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 adultscore=0 suspectscore=1 cotscore=-2147483648 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2005250151 Received-SPF: pass client-ip=156.151.31.85; envelope-from=daniel.kiper@oracle.com; helo=userp2120.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/25 15:03:00 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2020 19:03:04 -0000 From: Martin Whitaker 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 Signed-off-by: Daniel Kiper --- 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