[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/30: cvs-download: Use invoke instead of system*.
|
From: |
Mark H. Weaver |
|
Subject: |
26/30: cvs-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 54fcecdb1203bfb237a6ea3cbaa4112f91e21840
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 16 02:45:36 2018 -0400
cvs-download: Use invoke instead of system*.
* guix/build/cvs.scm (cvs-fetch): Use invoke and remove vestigial plumbing.
---
guix/build/cvs.scm | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/guix/build/cvs.scm b/guix/build/cvs.scm
index 9976e62..7111043 100644
--- a/guix/build/cvs.scm
+++ b/guix/build/cvs.scm
@@ -55,19 +55,20 @@ Return #t on success, #f otherwise."
;; Use "-z0" because enabling compression leads to hangs during checkout on
;; certain repositories, such as
;; ":pserver:address@hidden:/sources/gnustandards".
- (and (zero? (system* cvs-command "-z0"
- "-d" cvs-root-directory
- "checkout"
- (if (string-match "^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
revision)
- "-D" "-r")
- revision
- module))
- ;; Copy rather than rename in case MODULE and DIRECTORY are on
- ;; different devices.
- (copy-recursively module directory)
+ (invoke cvs-command "-z0"
+ "-d" cvs-root-directory
+ "checkout"
+ (if (string-match "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" revision)
+ "-D" "-r")
+ revision
+ module)
- (with-directory-excursion directory
- (for-each delete-file-recursively (find-cvs-directories)))
- #t))
+ ;; Copy rather than rename in case MODULE and DIRECTORY are on
+ ;; different devices.
+ (copy-recursively module directory)
+
+ (with-directory-excursion directory
+ (for-each delete-file-recursively (find-cvs-directories)))
+ #t)
;;; cvs.scm ends here
- 18/30: gnu: zlib: Use invoke instead of system*., (continued)
- 18/30: gnu: zlib: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 21/30: gnu: bzip2: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 06/30: build-system/perl: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 14/30: gnu: glibc-locales: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 03/30: build-system/gnu: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 17/30: gnu: tcsh: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 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 <=
- 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, 2018/03/16
- 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