GNU bug report logs - #39010
[PATCH] download, git: Refer to the right module in 'module-use!' call.

Previous Next

Full log

View this message in rfc822 format

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 39010 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [bug#39010] [PATCH] download, git: Refer to the right module in 'module-use!' call.
Date: Tue,  7 Jan 2020 14:34:10 +0100

From: Ludovic Courtès <ludo <at> gnu.org>

This fixes a regression introduced in
6a7c4636d4dec47eefa03c95da5a1315bd0e0413.

* guix/build/download.scm (load-gnutls): Call 'resolve-module' instead
of '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(-)

diff --git a/guix/build/download.scm b/guix/build/download.scm
index 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-directory
diff --git a/guix/git.scm b/guix/git.scm
index 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.