Package: guix-patches;
Reported by: Herman Rimm <herman <at> rimm.ee>
Date: Mon, 5 Feb 2024 14:52:02 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
Message #8 received at 68935 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee> To: 68935 <at> debbugs.gnu.org Cc: Herman Rimm <herman <at> rimm.ee> Subject: [PATCH 1/3] svn-fetch: Require svn-command argument. Date: Mon, 5 Feb 2024 16:07:12 +0100
* guix/build/svn.scm (svn-fetch): Require svn-command argument.
* guix/svn-download.scm: Pass svn-command to each (svn-fetch).
Change-Id: Ibc7d3a79e45374588f71ca4d4ac2685c60ff3c00
---
guix/build/svn.scm | 5 ++---
guix/svn-download.scm | 35 ++++++++++++++++++++++++++---------
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/guix/build/svn.scm b/guix/build/svn.scm
index 875d3c50ca..e8f168abc6 100644
--- a/guix/build/svn.scm
+++ b/guix/build/svn.scm
@@ -31,9 +31,8 @@ (define-module (guix build svn)
;;;
;;; Code:
-(define* (svn-fetch url revision directory
- #:key (svn-command "svn")
- (recursive? #t)
+(define* (svn-fetch url revision directory svn-command
+ #:key (recursive? #t)
(user-name #f)
(password #f))
"Fetch REVISION from URL into DIRECTORY. REVISION must be an integer, and a
diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index c6688908de..c4eeed3563 100644
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2014-2016, 2019, 2021-2023 Ludovic Courtès <ludo <at> gnu.org>
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha <at> totakura.in>
;;; Copyright © 2017, 2019, 2021 Ricardo Wurmus <rekado <at> elephly.net>
+;;; Copyright © 2024 Herman Rimm <herman <at> rimm.ee>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -105,7 +106,7 @@ (define* (svn-fetch ref hash-algo hash
(or (svn-fetch (getenv "svn url")
(string->number (getenv "svn revision"))
#$output
- #:svn-command #+(file-append svn "/bin/svn")
+ #+(file-append svn "/bin/svn")
#:recursive? (match (getenv "svn recursive?")
("yes" #t)
(_ #f))
@@ -195,7 +196,7 @@ (define* (svn-multi-fetch ref hash-algo hash
(if (string-suffix? "/" location)
(string-append #$output "/" location)
(string-append #$output "/" (dirname location)))
- #:svn-command #+(file-append svn "/bin/svn")
+ #+(file-append svn "/bin/svn")
#:recursive? (match (getenv "svn recursive?")
("yes" #t)
(_ #f))
@@ -245,25 +246,34 @@ (define* (svn-multi-fetch ref hash-algo hash
(define* (download-svn-to-store store ref
#:optional (name (basename (svn-reference-url ref)))
- #:key (log (current-error-port)))
+ #:key (log (current-error-port))
+ (svn (subversion-package)))
"Download from REF, a <svn-reference> object to STORE. Write progress
reports to LOG."
(call-with-temporary-directory
(lambda (temp)
(let ((result
(parameterize ((current-output-port log))
- (build:svn-fetch (svn-reference-url ref)
+ (with-imported-modules
+ (source-module-closure '((guix build svn)
+ (guix build utils)))
+ #~(begin
+ (use-modules (guix build svn)
+ (guix build utils))
+ (svn-fetch (svn-reference-url ref)
(svn-reference-revision ref)
(string-append temp "/svn")
+ #+(file-append svn "/bin/svn")
#:user-name (svn-reference-user-name ref)
- #:password (svn-reference-password ref)))))
+ #:password (svn-reference-password ref)))))))
(and result
(add-to-store store name #t "sha256"
(string-append temp "/svn")))))))
(define* (download-multi-svn-to-store store ref
#:optional (name (basename (svn-multi-reference-url ref)))
- #:key (log (current-error-port)))
+ #:key (log (current-error-port))
+ (svn (subversion-package)))
"Download from REF, a <svn-multi-reference> object to STORE. Write progress
reports to LOG."
(call-with-temporary-directory
@@ -272,16 +282,23 @@ (define* (download-multi-svn-to-store store ref
(let ((dir (string-append temp "/" (dirname location))))
(mkdir-p dir))
(parameterize ((current-output-port log))
- (build:svn-fetch (string-append (svn-multi-reference-url ref)
- "/" location)
+ (with-imported-modules
+ (source-module-closure '((guix build svn)
+ (guix build utils)))
+ #~(begin
+ (use-modules (guix build svn)
+ (guix build utils))
+ (svn-fetch (string-append (svn-multi-reference-url ref)
+ "/" location)
(svn-multi-reference-revision ref)
(if (string-suffix? "/" location)
(string-append temp "/" location)
(string-append temp "/" (dirname location)))
+ #+(file-append svn "/bin/svn")
#:recursive?
(svn-multi-reference-recursive? ref)
#:user-name (svn-multi-reference-user-name ref)
- #:password (svn-multi-reference-password ref))))
+ #:password (svn-multi-reference-password ref))))))
(svn-multi-reference-locations ref))
(add-to-store store name #t "sha256" temp)))))
--
2.41.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.