diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-10-24 00:57:23 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-10-24 01:08:23 +0200 |
| commit | 8a2b23178274127dac07e1163267d623790ce36a (patch) | |
| tree | e785ee309960d9203efd4ef10528ad7c35800036 | |
| parent | f98be942e314d9add540a71b987fc5510d1981e1 (diff) | |
| download | patches-8a2b23178274127dac07e1163267d623790ce36a.tar patches-8a2b23178274127dac07e1163267d623790ce36a.tar.gz | |
Revert "guix: svn: Allow dropping externals."
This reverts commit 51395c84fdbf8daed6392951a973ad750cf3eefa,
fixing <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=37896>.
Reported by <o.rojon@posteo.net>.
| -rw-r--r-- | guix/build/svn.scm | 4 | ||||
| -rw-r--r-- | guix/svn-download.scm | 15 |
2 files changed, 4 insertions, 15 deletions
diff --git a/guix/build/svn.scm b/guix/build/svn.scm index 33783f3056..e3188add3e 100644 --- a/guix/build/svn.scm +++ b/guix/build/svn.scm @@ -31,7 +31,6 @@ (define* (svn-fetch url revision directory #:key (svn-command "svn") - (recursive? #t) (user-name #f) (password #f)) "Fetch REVISION from URL into DIRECTORY. REVISION must be an integer, and a @@ -46,9 +45,6 @@ valid Subversion revision. Return #t on success, #f otherwise." (list (string-append "--username=" user-name) (string-append "--password=" password)) '()) - ,@(if recursive? - '() - (list "--ignore-externals")) ,url ,directory)) #t) diff --git a/guix/svn-download.scm b/guix/svn-download.scm index d912474aa2..4139cbc2e2 100644 --- a/guix/svn-download.scm +++ b/guix/svn-download.scm @@ -31,7 +31,6 @@ svn-reference? svn-reference-url svn-reference-revision - svn-reference-recursive? svn-fetch download-svn-to-store @@ -40,7 +39,6 @@ svn-multi-reference-url svn-multi-reference-revision svn-multi-reference-locations - svn-multi-reference-recursive? svn-multi-fetch)) ;;; Commentary: @@ -54,11 +52,10 @@ (define-record-type* <svn-reference> svn-reference make-svn-reference svn-reference? - (url svn-reference-url) ; string - (revision svn-reference-revision) ; number - (recursive? svn-reference-recursive? (default #t)) - (user-name svn-reference-user-name (default #f)) - (password svn-reference-password (default #f))) + (url svn-reference-url) ; string + (revision svn-reference-revision) ; number + (user-name svn-reference-user-name (default #f)) + (password svn-reference-password (default #f))) (define (subversion-package) "Return the default Subversion package." @@ -81,7 +78,6 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." '#$(svn-reference-revision ref) #$output #:svn-command (string-append #+svn "/bin/svn") - #:recursive? #$(svn-reference-recursive? ref) #:user-name #$(svn-reference-user-name ref) #:password #$(svn-reference-password ref))))) @@ -100,7 +96,6 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (url svn-multi-reference-url) ; string (revision svn-multi-reference-revision) ; number (locations svn-multi-reference-locations) ; list of strings - (recursive? svn-multi-reference-recursive? (default #t)) (user-name svn-multi-reference-user-name (default #f)) (password svn-multi-reference-password (default #f))) @@ -130,8 +125,6 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (string-append #$output "/" location) (string-append #$output "/" (dirname location))) #:svn-command (string-append #+svn "/bin/svn") - #:recursive? - #$(svn-reference-recursive? ref) #:user-name #$(svn-multi-reference-user-name ref) #:password #$(svn-multi-reference-password ref))) '#$(svn-multi-reference-locations ref))))) |