me
/
guix
Archived
1
0
Fork 0
Code

build: svn: Fix handle fetch errors. 

This fixes the revert 1ec67d5220.

* guix/build/svn.scm (svn-fetch): Add 'guard' to handle errors.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
master
zimoun 2020-10-07 01:05:21 +02:00 committed by Mathieu Othacehe
parent 44e65a7588
commit db9e4af0ea
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
guix/build/svn.scm
View File

@ -2,6 +2,7 @@
;;; 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.
;;;
@ -20,6 +21,8 @@
(define-module (guix build svn)
#:use-module (guix build utils)
#:use-module (srfi srfi-34)
#:use-module (ice-9 format)
#:export (svn-fetch))
;;; Commentary:
@ -36,20 +39,29 @@
(password #f))
"Fetch REVISION from URL into DIRECTORY. REVISION must be an integer, and a
valid Subversion revision. Return #t on success, #f otherwise."
(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)
(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)))
#f))
(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