aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Nieuwenhuizen <janneke@gnu.org>2016-03-26 13:40:38 +0100
committerLudovic Courtès <ludo@gnu.org>2016-04-01 00:05:42 +0200
commitab83105bbe93cdaf10c4bdb4655428a2df8c7e24 (patch)
tree3b172a17758070b1bad98bf5cd6777a98d5cf76b
parent47268eec136a64df4f1f249522b989e0063e47da (diff)
downloadguix-ab83105bbe93cdaf10c4bdb4655428a2df8c7e24.tar
guix-ab83105bbe93cdaf10c4bdb4655428a2df8c7e24.tar.gz
cvs: Allow checkouts when /tmp is a different device.
* guix/build/cvs.scm (cvs-fetch): Use 'copy-recursively' instead of 'rename-file'. Co-authored-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--guix/build/cvs.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/build/cvs.scm b/guix/build/cvs.scm
index bd5c50a51a..033b626b96 100644
--- a/guix/build/cvs.scm
+++ b/guix/build/cvs.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -58,7 +59,10 @@ Return #t on success, #f otherwise."
"-D" "-r")
revision
module))
- (rename-file module directory)
+ ;; 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))