branch tex-team-next updated: svn-download: Handle the single file case when downloading a nar.

[guix-commits]

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

cbaines pushed a commit to branch tex-team-next
in repository guix.

The following commit(s) were added to refs/heads/tex-team-next by this push:
     new fde787ccac svn-download: Handle the single file case when downloading 
a nar.
fde787ccac is described below

commit fde787ccac15f5e857e4a1a962f6254db963ca9b
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Tue Jul 11 16:00:20 2023 +0100

    svn-download: Handle the single file case when downloading a nar.
    
    Delete the output so that download-nar doesn't error when trying to restore.
    
    * guix/svn-download.scm (svn-multi-fetch): Delete the output if it exists
    prior to calling download-nar.
---
 guix/svn-download.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index 78b13f62a4..c6688908de 100644
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -203,7 +203,10 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
                               #:password (getenv "svn password")))
                  (call-with-input-string (getenv "svn locations")
                    read))
-                (download-nar #$output))))))
+                (begin
+                  (when (file-exists? #$output)
+                    (delete-file-recursively #$output))
+                  (download-nar #$output)))))))
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "svn-checkout") build