me/guix
Archived
1
0
Fork 0
Code Activity

svn-download: Use invoke instead of system*.

Browse source 
* guix/build/svn.scm (svn-fetch): Use invoke and remove vestigial plumbing.
This commit is contained in:
Mark H Weaver 2018-03-16 03:10:29 -04:00
parent 54fcecdb12
commit 81d8211e1b
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
guix/build/svn.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in> ;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -34,23 +35,24 @@
(password #f)) (password #f))
"Fetch REVISION from URL into DIRECTORY. REVISION must be an integer, and a "Fetch REVISION from URL into DIRECTORY. REVISION must be an integer, and a
valid Subversion revision. Return #t on success, #f otherwise." valid Subversion revision. Return #t on success, #f otherwise."
(and (zero? (apply system* svn-command (apply invoke svn-command
"checkout" "--non-interactive" "checkout" "--non-interactive"
;; Trust the server certificate. This is OK as we ;; Trust the server certificate. This is OK as we
;; verify the checksum later. This can be removed when ;; verify the checksum later. This can be removed when
;; ca-certificates package is added. ;; ca-certificates package is added.
"--trust-server-cert" "-r" (number->string revision) "--trust-server-cert" "-r" (number->string revision)
`(,@(if (and user-name password) `(,@(if (and user-name password)
(list (string-append "--username=" user-name) (list (string-append "--username=" user-name)
(string-append "--password=" password)) (string-append "--password=" password))
'()) '())
,url ,directory))) ,url ,directory))
(with-directory-excursion directory
(begin ;; The contents of '.svn' vary as a function of the current status
;; The contents of '.svn' vary as a function of the current status ;; of the repo. Since we want a fixed output, this directory needs
;; of the repo. Since we want a fixed output, this directory needs ;; to be taken out.
;; to be taken out. (with-directory-excursion directory
(delete-file-recursively ".svn") (delete-file-recursively ".svn"))
#t))))
#t)
;;; svn.scm ends here ;;; svn.scm ends here