* [bug#39010] [PATCH] download, git: Refer to the right module in 'module-use!' call.
@ 2020-01-07 13:34 Hartmut Goebel
[not found] ` <handler.39010.B.157840406725460.ack@debbugs.gnu.org>
0 siblings, 1 reply; 2+ messages in thread
From: Hartmut Goebel @ 2020-01-07 13:34 UTC (permalink / raw)
To: 39010; +Cc: Ludovic Courtès
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#39010] Patch send by accident
[not found] ` <handler.39010.B.157840406725460.ack@debbugs.gnu.org>
@ 2020-01-07 13:40 ` Hartmut Goebel
0 siblings, 0 replies; 2+ messages in thread
From: Hartmut Goebel @ 2020-01-07 13:40 UTC (permalink / raw)
To: 39010
Patch send by accident, this is already merged on master.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-07 13:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-07 13:34 [bug#39010] [PATCH] download, git: Refer to the right module in 'module-use!' call Hartmut Goebel
[not found] ` <handler.39010.B.157840406725460.ack@debbugs.gnu.org>
2020-01-07 13:40 ` [bug#39010] Patch send by accident Hartmut Goebel
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).