diff mbox series

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

Message ID 20200107133410.24810-1-h.goebel@crazy-compilers.com
State Accepted
Headers show
Series [bug#39010] download, git: Refer to the right module in 'module-use!' call. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Hartmut Goebel Jan. 7, 2020, 1:34 p.m. UTC 
From: Ludovic Courtès <ludo@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(-)

Comments

Hartmut Goebel Jan. 7, 2020, 1:40 p.m. UTC | #1 
Patch send by accident, this is already merged on master.
diff mbox series

Patch

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)))