guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: guix: profiles: Fix auto-generated file deletion.


From: guix-commits
Subject: branch master updated: guix: profiles: Fix auto-generated file deletion.
Date: Sun, 30 Jul 2023 05:05:30 -0400

This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new c173819c8e guix: profiles: Fix auto-generated file deletion.
c173819c8e is described below

commit c173819c8e5235ce02d60b79bd88b10023a7c614
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Sun Jul 30 10:57:41 2023 +0200

    guix: profiles: Fix auto-generated file deletion.
    
    * guix/profiles.scm (texlive-font-maps): Make sure auto-generated file 
exists
    before deleting it, which is not guaranteed when creating the initial texmf
    tree union.
    
    This is a followup to e43cbeafd1b632f39b08b3644af5230d5350a656.
---
 guix/profiles.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 6c88759cae..c62d7f4d22 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1815,9 +1815,12 @@ MANIFEST."
                        #:create-all-directories? #t
                        #:log-port (%make-void-port "w"))
 
-          ;; Clear files that are going to be regenerated.
+          ;; Clear files that are going to be regenerated, or copied from
+          ;; a different place, in order to prevent failures during profile
+          ;; generation.
           (with-directory-excursion "/tmp/texlive/share/texmf-dist"
-            (for-each delete-file
+            (for-each (lambda (file)
+                        (when (file-exists? file) (delete-file file)))
                       (list "fonts/map/dvipdfmx/updmap/kanjix.map"
                             "fonts/map/dvips/updmap/builtin35.map"
                             "fonts/map/dvips/updmap/download35.map"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]