From ab83105bbe93cdaf10c4bdb4655428a2df8c7e24 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 26 Mar 2016 13:40:38 +0100 Subject: cvs: Allow checkouts when /tmp is a different device. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/cvs.scm (cvs-fetch): Use 'copy-recursively' instead of 'rename-file'. Co-authored-by: Ludovic Courtès --- guix/build/cvs.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 +;;; Copyright © 2016 Jan Nieuwenhuizen ;;; ;;; 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)) -- cgit v1.2.3