[PATCH] download, git: Refer to the right module in 'module-use!' call.

DoneSubmitted by Hartmut Goebel.
Details
2 participants
  • Hartmut Goebel
  • Ludovic Courtès
Owner
unassigned
Severity
normal
H
H
Hartmut Goebel wrote on 7 Jan 2020 14:34
(address . guix-patches@gnu.org)(name . Ludovic Courtès)(address . ludo@gnu.org)
20200107133410.24810-1-h.goebel@crazy-compilers.com
From: Ludovic Courtès <ludo@gnu.org>
This fixes a regression introduced in6a7c4636d4dec47eefa03c95da5a1315bd0e0413.
* guix/build/download.scm (load-gnutls): Call 'resolve-module' insteadof 'current-module'.* guix/git.scm (load-git-submodules): Likewise.--- guix/build/download.scm | 3 ++- guix/git.scm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
Toggle diff (29 lines)diff --git a/guix/build/download.scm b/guix/build/download.scmindex 641dacefa1..0f2d5f402a 100644--- a/guix/build/download.scm+++ b/guix/build/download.scm@@ -158,7 +158,8 @@ out if the connection could not be established in less than TIMEOUT seconds." (define (load-gnutls) ;; XXX: Use this hack instead of #:autoload to avoid compilation errors. ;; See <http://bugs.gnu.org/12202>.- (module-use! (current-module) (resolve-interface '(gnutls)))+ (module-use! (resolve-module '(guix build download))+ (resolve-interface '(gnutls))) (set! load-gnutls (const #t))) (define %x509-certificate-directorydiff --git a/guix/git.scm b/guix/git.scmindex 15a0a6f9e5..a12f1eec8e 100644--- a/guix/git.scm+++ b/guix/git.scm@@ -203,7 +203,7 @@ Return true on success, false on failure." (set! load-git-submodules (const #f)) #f) (iface- (module-use! (current-module) iface)+ (module-use! (resolve-module '(guix git)) iface) (set! load-git-submodules (const #t)) #t))) -- 2.21.1
H
H
Hartmut Goebel wrote on 7 Jan 2020 14:40
Patch send by accident
(address . 39010@debbugs.gnu.org)
eead6f03-8860-3e6c-c5bd-c4d94646de68@crazy-compilers.com
Patch send by accident, this is already merged on master.
L
L
Ludovic Courtès wrote on 9 Jan 2020 22:53
control message for bug #39010
(address . control@debbugs.gnu.org)
87r208s3dj.fsf@gnu.org
tags 39010 notabugclose 39010quit
?
Your comment

This issue is archived.

To comment on this conversation send email to 39010@debbugs.gnu.org