civodul pushed a commit to branch master
in repository guix.
commit 36b8539977d8c2deea004094d3ea6302b58ddea1
Author: Ludovic Courtès <[email protected]>
AuthorDate: Tue Dec 10 23:18:31 2024 +0100
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
---
guix/git.scm | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/guix/git.scm b/guix/git.scm
index 410cd4c153..1b0839b1e3 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -185,19 +185,13 @@ the 'SSL_CERT_FILE' and 'SSL_CERT_DIR' environment
variables."
(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.
