From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 39010@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@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 [thread overview]
Message-ID: <20200107133410.24810-1-h.goebel@crazy-compilers.com> (raw)
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
next reply other threads:[~2020-01-07 13:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 13:34 Hartmut Goebel [this message]
[not found] ` <handler.39010.B.157840406725460.ack@debbugs.gnu.org>
2020-01-07 13:40 ` [bug#39010] Patch send by accident Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200107133410.24810-1-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=39010@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).