mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-18 13:36:36 +01:00
git: Remove Guile-Git < 0.4.0 compatibility fallback.
Guile-Git 0.4.0 was released in October 2020. * guix/git.scm (make-default-fetch-options): Remove ‘wrong-number-of-args’ fallback. Change-Id: I5ebcb7212fd96241ea5defc4127e9880a6dd9667
This commit is contained in:
parent
a75b2d614a
commit
36b8539977
1 changed files with 7 additions and 13 deletions
20
guix/git.scm
20
guix/git.scm
|
@ -185,19 +185,13 @@ (define grain
|
|||
(define (make-default-fetch-options)
|
||||
"Return the default fetch options."
|
||||
(let ((auth-method (%make-auth-ssh-agent)))
|
||||
;; The #:transfer-progress and #:proxy-url options appeared in Guile-Git
|
||||
;; 0.4.0. Omit them when using an older version.
|
||||
(catch 'wrong-number-of-args
|
||||
(lambda ()
|
||||
(make-fetch-options auth-method
|
||||
;; Guile-Git doesn't distinguish between these.
|
||||
#:proxy-url (or (getenv "http_proxy")
|
||||
(getenv "https_proxy"))
|
||||
#:transfer-progress
|
||||
(and (isatty? (current-error-port))
|
||||
show-progress)))
|
||||
(lambda args
|
||||
(make-fetch-options auth-method)))))
|
||||
(make-fetch-options auth-method
|
||||
;; Guile-Git doesn't distinguish between these.
|
||||
#:proxy-url (or (getenv "http_proxy")
|
||||
(getenv "https_proxy"))
|
||||
#:transfer-progress
|
||||
(and (isatty? (current-error-port))
|
||||
show-progress))))
|
||||
|
||||
(define GITERR_HTTP
|
||||
;; Guile-Git <= 0.5.2 lacks this constant.
|
||||
|
|
Loading…
Reference in a new issue