| Message ID | 7498899ac5e19362bdaae45c2bf185bb10709a71.1734567208.git.noelopez@free.fr |
|---|---|
| State | New |
| Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4DC7D27BBEA; Thu, 19 Dec 2024 00:15:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CB30327BBE2 for <patchwork@mira.cbaines.net>; Thu, 19 Dec 2024 00:15:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1tO4C1-0006C2-SQ; Wed, 18 Dec 2024 19:15:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tO4Bz-0006A0-WB for guix-patches@gnu.org; Wed, 18 Dec 2024 19:15:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tO4Bz-00049c-Mp for guix-patches@gnu.org; Wed, 18 Dec 2024 19:15:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=8BuJsZowJVJ+Q+rGyXC8qOV8QBKV0fcTw5RZAyE+xSg=; b=ghDRxAeWCH0Zy5MGa6EVi2E0R85dwjtazh/Quxoewz9dj8x/ygq9rn+XVwDsmDGY3mhhkjjLpbMFGjVm+ktXa1Rb6jVBO1cgNHcGsVSsSLWIQliSJLp1/yDU6Xmnw2CwzygcFdVenVwUBSE04t/xDbKbUVRGq3WGALIsASX4ITOR5IrWbSmp+c8UDGCY883Y7LgioHVd5rP6O/Ry6ZXkOi0jGUffzcpz1VH4wL7jrCf3yWa0aPioFdhKP2VcNit+7HtzMdGUCx1NiQSKauGjOp96+YcmfWEk/UDHTzroAXLKOaZ0giBIrazModngdBwLlKjQPKIBVbSi3hH3UA9CDw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tO4By-0001mC-Hf for guix-patches@gnu.org; Wed, 18 Dec 2024 19:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74956] [PATCH] build: pack: Fix unexpected type in assert-utf8-local. Resent-From: =?utf-8?q?No=C3=A9?= Lopez <noe@xn--no-cja.eu> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 00:15:02 +0000 Resent-Message-ID: <handler.74956.B.17345672506726@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74956 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74956@debbugs.gnu.org Cc: =?utf-8?q?No=C3=A9?= Lopez <noe@xn--no-cja.eu> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17345672506726 (code B ref -1); Thu, 19 Dec 2024 00:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2024 00:14:10 +0000 Received: from localhost ([127.0.0.1]:36514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1tO4B8-0001kP-EI for submit@debbugs.gnu.org; Wed, 18 Dec 2024 19:14:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:43884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <noe@xn--no-cja.eu>) id 1tO4B6-0001kI-KU for submit@debbugs.gnu.org; Wed, 18 Dec 2024 19:14:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <noe@xn--no-cja.eu>) id 1tO4B6-000632-Bs for guix-patches@gnu.org; Wed, 18 Dec 2024 19:14:08 -0500 Received: from smtp.domeneshop.no ([2a01:5b40:0:3006::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <noe@xn--no-cja.eu>) id 1tO4B4-00045v-1F for guix-patches@gnu.org; Wed, 18 Dec 2024 19:14:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xn--no-cja.eu; s=ds202402; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-ID:Date:Subject:Cc:To:From:From:Sender:Reply-To:Subject: Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=8BuJsZowJVJ+Q+rGyXC8qOV8QBKV0fcTw5RZAyE+xSg=; b=yyqTKZUtM84G2yXdL6BW80dmd+ zTg4dE9PdUdz0fzej0HoIMrpdrsRtrRsPYvBiVvUql71+QX4L+mIN1UfPRFljemerDTYzm/XWpcwV GDN53vjXwhjedkjus/apE7hOrhFEt86642sNy2jUq6KXk6wvqT5dVC0SdBW4VFOeesblLi+zUDuPM 917vtWfiUOnRFxnZBcYtQ0qpWlK9Xsm+alEiSUihjwZ/TdGL10P1oYaFMU3SqP4tIki2Kn7B1A2WQ 3KOeflxHOA8SRNpCxfMdYxxnn+WSZFaIF87cxnZdC9JzVTWxNtA40phTiT4MKPscwnX0AmsyVgQ7T cge3W9ZQ==; Received: from smtp by smtp.domeneshop.no with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) id 1tO4Au-00COdr-6y; Thu, 19 Dec 2024 01:13:56 +0100 Date: Thu, 19 Dec 2024 01:15:05 +0100 Message-ID: <7498899ac5e19362bdaae45c2bf185bb10709a71.1734567208.git.noelopez@free.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a01:5b40:0:3006::1; envelope-from=noe@xn--no-cja.eu; helo=smtp.domeneshop.no X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Reply-to: =?utf-8?q?No=C3=A9?= Lopez <noe@xn--no-cja.eu> X-ACL-Warn: , =?utf-8?q?No=C3=A9_Lopez_via_Guix-patches?= <guix-patches@gnu.org> From: =?utf-8?q?No=C3=A9_Lopez_via_Guix-patches?= via <guix-patches@gnu.org> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches |
| Series |
[bug#74956] build: pack: Fix unexpected type in assert-utf8-local.
|
|
Commit Message
Noé Lopez
Dec. 19, 2024, 12:15 a.m. UTC
From: Noé Lopez <noelopez@free.fr>
getenv returns #f if the environment variable does not exist, causing a type
error since string=? expects a string.
* guix/build/pack.scm (assert-utf8-locale): Handle unset environment variable.
Change-Id: Idbe7a33a4c8453b8f4ffe6245c32c1373020fb06
---
guix/build/pack.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
base-commit: 1a62f687e504c67f26693f3bc60a90e503ab4ea9
diff --git a/guix/build/pack.scm b/guix/build/pack.scm index fcb1da2a6c..1b28101469 100644 --- a/guix/build/pack.scm +++ b/guix/build/pack.scm @@ -72,7 +72,7 @@ (define* (tar-base-options #:key tar compressor) (define (assert-utf8-locale) "Verify the current process is using the en_US.utf8 locale." - (unless (string=? "unset for tests" (getenv "GUIX_LOCPATH")) + (unless (string=? "unset for tests" (or (getenv "GUIX_LOCPATH") "")) (unless (false-if-exception (setlocale LC_ALL "en_US.utf8")) (error "environment not configured for en_US.utf8 locale"))))