From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 17 16:02:38 2019 Received: (at submit) by debbugs.gnu.org; 17 Jan 2019 21:02:38 +0000 Received: from localhost ([127.0.0.1]:35371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gkEo9-0007Pq-Sd for submit@debbugs.gnu.org; Thu, 17 Jan 2019 16:02:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49989) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gkEo8-0007Pd-8O for submit@debbugs.gnu.org; Thu, 17 Jan 2019 16:02:36 -0500 Received: from lists.gnu.org ([209.51.188.17]:50332) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gkEnu-0007i5-S2 for submit@debbugs.gnu.org; Thu, 17 Jan 2019 16:02:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkEnu-00036H-5F for guix-patches@gnu.org; Thu, 17 Jan 2019 16:02:22 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,UNPARSEABLE_RELAY autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkEnr-0007fr-Ts for guix-patches@gnu.org; Thu, 17 Jan 2019 16:02:21 -0500 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:60350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkEnr-0007ej-LV for guix-patches@gnu.org; Thu, 17 Jan 2019 16:02:19 -0500 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 204E916A30 for ; Thu, 17 Jan 2019 21:02:18 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id fcaa7d57 for ; Thu, 17 Jan 2019 21:02:17 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] guix: Add guard to texlive-configuration profile hook. Date: Thu, 17 Jan 2019 21:02:17 +0000 Message-Id: <20190117210217.18351-1-mail@cbaines.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a01:7e00::f03c:91ff:fe69:8da9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) It is possible to generate a profile where this hook will crash, as the texmf.cnf file does not exist to be patched by substitute*. A simple exam= ple is the profile just containing texlive-fonts-txfonts. * guix/profiles.scm (texlive-configuration): Check that the texmf.cnf fil= e exists before trying to change it. --- guix/profiles.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index d22539bdb2..598e0acf62 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1363,12 +1363,15 @@ MANIFEST." (manifest-entries manifest)) #:create-all-directories? #t #:log-port (%make-void-port "w")) - (substitute* (string-append #$output - "/share/texmf-dist/web2c/texmf.cnf= ") - (("^TEXMFROOT =3D .*") - (string-append "TEXMFROOT =3D " #$output "/share\n")) - (("^TEXMF =3D .*") - "TEXMF =3D $TEXMFROOT/share/texmf-dist\n")) + (let ((texmf.cnf (string-append + #$output + "/share/texmf-dist/web2c/texmf.cnf"))) + (when (file-exists? texmf.cnf) + (substitute* texmf.cnf + (("^TEXMFROOT =3D .*") + (string-append "TEXMFROOT =3D " #$output "/share\n")) + (("^TEXMF =3D .*") + "TEXMF =3D $TEXMFROOT/share/texmf-dist\n")))) #t))) =20 (with-monad %store-monad --=20 2.20.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 18 10:51:55 2019 Received: (at 34118) by debbugs.gnu.org; 18 Jan 2019 15:51:55 +0000 Received: from localhost ([127.0.0.1]:36945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gkWR0-0008Kg-Mr for submit@debbugs.gnu.org; Fri, 18 Jan 2019 10:51:54 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:42022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gkWQy-0008KU-7A for 34118@debbugs.gnu.org; Fri, 18 Jan 2019 10:51:53 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 9E34C2747; Fri, 18 Jan 2019 16:51:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BasKw0FINx-2; Fri, 18 Jan 2019 16:51:50 +0100 (CET) Received: from ribbon (unknown [IPv6:2001:660:6102:320:e120:2c8f:8909:cdfe]) by hera.aquilenet.fr (Postfix) with ESMTPSA id CD42623A6; Fri, 18 Jan 2019 16:51:49 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Christopher Baines Subject: Re: [bug#34118] [PATCH] guix: Add guard to texlive-configuration profile hook. References: <20190117210217.18351-1-mail@cbaines.net> Date: Fri, 18 Jan 2019 16:51:49 +0100 In-Reply-To: <20190117210217.18351-1-mail@cbaines.net> (Christopher Baines's message of "Thu, 17 Jan 2019 21:02:17 +0000") Message-ID: <87lg3irmju.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 34118 Cc: 34118@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hello, Christopher Baines skribis: > It is possible to generate a profile where this hook will crash, as the > texmf.cnf file does not exist to be patched by substitute*. A simple example > is the profile just containing texlive-fonts-txfonts. > > * guix/profiles.scm (texlive-configuration): Check that the texmf.cnf file > exists before trying to change it. LGTM, thanks! Ludo'. From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 18 11:19:16 2019 Received: (at 34118-done) by debbugs.gnu.org; 18 Jan 2019 16:19:16 +0000 Received: from localhost ([127.0.0.1]:36974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gkWrT-0000av-Q6 for submit@debbugs.gnu.org; Fri, 18 Jan 2019 11:19:16 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:50934 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gkWrR-0000an-BX for 34118-done@debbugs.gnu.org; Fri, 18 Jan 2019 11:19:14 -0500 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 5F86B16A0B; Fri, 18 Jan 2019 16:19:12 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 50441eae; Fri, 18 Jan 2019 16:19:12 +0000 (UTC) References: <20190117210217.18351-1-mail@cbaines.net> <87lg3irmju.fsf@gnu.org> User-agent: mu4e 1.0; emacs 26.1 From: Christopher Baines To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#34118] [PATCH] guix: Add guard to texlive-configuration profile hook. In-reply-to: <87lg3irmju.fsf@gnu.org> Date: Fri, 18 Jan 2019 16:19:11 +0000 Message-ID: <8736pqlz0g.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 34118-done Cc: 34118-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hello, > > Christopher Baines skribis: > >> It is possible to generate a profile where this hook will crash, as the >> texmf.cnf file does not exist to be patched by substitute*. A simple exa= mple >> is the profile just containing texlive-fonts-txfonts. >> >> * guix/profiles.scm (texlive-configuration): Check that the texmf.cnf fi= le >> exists before trying to change it. > > LGTM, thanks! Great, I've pushed this to master now. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlxB/H9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XejQQ/+OHVQhCPW+jgXypnohzMj9ZvFKsYh7zs64HXwKgF2jALPNiudB5BfTEKN Ju+b0nYi4BePAPahEr10dY2YDgN7V2jLgpYS2gpyWiLUZ6EAJpX7NLwl4C+dcc8W 5t68JU7rhXScZMgg9JFpAGZeSJDosgSNmlxv/JbHmZRUKHQXWT1qSEfnIjvv9CGi 4grhy2hJrYvFXmbl1zyjwGY2btzSpotyZMaWnnMfORrFIpcB/wIvo6u0IxnF0hHD MZ4B4J1ewjuBQBzhwzH9S2idRiDFGZDFsIyuOE+Fy6wr4bAwh8vmTrl0Euhhp7Sy brB6EDtFqJ3W3Y6TiU0zxbpXcLX9i0irPCNlObc6vBDDVtbbhxpMKwNCY8OS0l5L Awq4Q02awxKUY3dMA5I+PcIIIZmLjoUokIoFr0zqCc4apHgy/bcuZujwN1rafOPu trRcRB7/erS9p1qudCYZT9PRD39OjhoR8zOrNJmVk7IIgBbDt6EzPd00mSzdls7C r6CTHJyFjrXpG3dlx5N2k1LZ4Odb1ZgasHRtFvm4Lt0sh1wTuUVXunA4aXqCs+Zq l+ODS4srY8+nLpAyytmsY43X33LORH42Igosgc0LMwlv3O68HOMNfk61VUzP8sSH ToOA4wMXOff8mwWXtEJvPeiB1PDc4jYYfB8UTi66f4QUIs7Pva4= =A5x7 -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 00:54:54 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 16 Feb 2019 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator