branch master updated: Revert "build: svn: Handle fetch errors."

[guix-commits]

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

pgarlick pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1ec67d5  Revert "build: svn: Handle fetch errors."
1ec67d5 is described below

commit 1ec67d5220b0ebac20263b44f4fefaf51ba8fdbb
Author: Paul Garlick <pgarlick@tourbillion-technology.com>
AuthorDate: Tue Oct 6 14:44:09 2020 +0100

    Revert "build: svn: Handle fetch errors."
    
    This reverts commit 2fb12dd1bb725592e1561ac8f4b32fb68accb161, which
    causes the 'svn export' command to fail with:
    
    svn: E155000: Destination directory exists; please remove the directory
    or use --force to overwrite
---
 guix/build/svn.scm | 46 +++++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/guix/build/svn.scm b/guix/build/svn.scm
index 48d28f0..33783f3 100644
--- a/guix/build/svn.scm
+++ b/guix/build/svn.scm
@@ -2,7 +2,6 @@
 ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
 ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,8 +20,6 @@
 
 (define-module (guix build svn)
   #:use-module (guix build utils)
-  #:use-module (srfi srfi-34)
-  #:use-module (ice-9 format)
   #:export (svn-fetch))
 
 ;;; Commentary:
@@ -39,33 +36,20 @@
                     (password #f))
   "Fetch REVISION from URL into DIRECTORY.  REVISION must be an integer, and a
 valid Subversion revision.  Return #t on success, #f otherwise."
-  (mkdir-p directory)
-
-  (guard (c ((invoke-error? c)
-             (format (current-error-port)
-                     "svn-fetch: '~a~{ ~a~}' failed with exit code ~a~%"
-                     (invoke-error-program c)
-                     (invoke-error-arguments c)
-                     (or (invoke-error-exit-status c)
-                         (invoke-error-stop-signal c)
-                         (invoke-error-term-signal c)))
-             (delete-file-recursively directory)
-             #f))
-    (with-directory-excursion directory
-      (apply invoke svn-command
-             "export" "--non-interactive"
-             ;; Trust the server certificate.  This is OK as we
-             ;; verify the checksum later.  This can be removed when
-             ;; ca-certificates package is added.
-             "--trust-server-cert" "-r" (number->string revision)
-             `(,@(if (and user-name password)
-                     (list (string-append "--username=" user-name)
-                           (string-append "--password=" password))
-                     '())
-               ,@(if recursive?
-                     '()
-                     (list "--ignore-externals"))
-               ,url ,directory))
-      #t)))
+  (apply invoke svn-command
+         "export" "--non-interactive"
+         ;; Trust the server certificate.  This is OK as we
+         ;; verify the checksum later.  This can be removed when
+         ;; ca-certificates package is added.
+         "--trust-server-cert" "-r" (number->string revision)
+         `(,@(if (and user-name password)
+                 (list (string-append "--username=" user-name)
+                       (string-append "--password=" password))
+                 '())
+           ,@(if recursive?
+                 '()
+                 (list "--ignore-externals"))
+           ,url ,directory))
+  #t)
 
 ;;; svn.scm ends here