[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
27/30: svn-download: Use invoke instead of system*.
From: |
Mark H. Weaver |
Subject: |
27/30: svn-download: Use invoke instead of system*. |
Date: |
Fri, 16 Mar 2018 05:03:39 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 81d8211e1bf3fa40bc72c1c219ef4eaae590f2dc
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 16 03:10:29 2018 -0400
svn-download: Use invoke instead of system*.
* guix/build/svn.scm (svn-fetch): Use invoke and remove vestigial plumbing.
---
guix/build/svn.scm | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/guix/build/svn.scm b/guix/build/svn.scm
index 31c30ed..252d1d4 100644
--- a/guix/build/svn.scm
+++ b/guix/build/svn.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Ludovic Courtès <address@hidden>
;;; Copyright © 2014 Sree Harsha Totakura <address@hidden>
+;;; Copyright © 2018 Mark H Weaver <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,23 +35,24 @@
(password #f))
"Fetch REVISION from URL into DIRECTORY. REVISION must be an integer, and a
valid Subversion revision. Return #t on success, #f otherwise."
- (and (zero? (apply system* svn-command
- "checkout" "--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))
- '())
- ,url ,directory)))
- (with-directory-excursion directory
- (begin
- ;; The contents of '.svn' vary as a function of the current status
- ;; of the repo. Since we want a fixed output, this directory needs
- ;; to be taken out.
- (delete-file-recursively ".svn")
- #t))))
+ (apply invoke svn-command
+ "checkout" "--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))
+ '())
+ ,url ,directory))
+
+ ;; The contents of '.svn' vary as a function of the current status
+ ;; of the repo. Since we want a fixed output, this directory needs
+ ;; to be taken out.
+ (with-directory-excursion directory
+ (delete-file-recursively ".svn"))
+
+ #t)
;;; svn.scm ends here
- 23/30: gnu: eudev: Use invoke instead of system*., (continued)
- 23/30: gnu: eudev: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 09/30: build-system/scons: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 30/30: gnu: attr: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 02/30: gnu-dist: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 26/30: cvs-download: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 22/30: gnu: openssl: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 20/30: gnu: zip: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 11/30: download: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 15/30: gnu: glibc/hurd: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 29/30: build: emacs-utils: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 27/30: svn-download: Use invoke instead of system*.,
Mark H. Weaver <=
- 13/30: gnu: glibc-utf8-locales: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 28/30: hg-download: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 24/30: gnu: tzdata: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 01/30: packages: patch-and-repack: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 16/30: gnu: perl: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 25/30: gnu: python-six: Use invoke instead of system*., Mark H. Weaver, 2018/03/16