From patchwork Tue Jan 7 13:34:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 19677 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 37BE717A24; Tue, 7 Jan 2020 13:42:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id EFFBE17A1C for ; Tue, 7 Jan 2020 13:42:50 +0000 (GMT) Received: from localhost ([::1]:48996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iop8D-0006rB-1I for patchwork@mira.cbaines.net; Tue, 07 Jan 2020 08:42:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47525) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iop0h-00027C-Hk for guix-patches@gnu.org; Tue, 07 Jan 2020 08:35:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iop0g-00070A-8T for guix-patches@gnu.org; Tue, 07 Jan 2020 08:35:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41560) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iop0g-000705-5w for guix-patches@gnu.org; Tue, 07 Jan 2020 08:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iop0g-0006de-3h for guix-patches@gnu.org; Tue, 07 Jan 2020 08:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39010] [PATCH] download, git: Refer to the right module in 'module-use!' call. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Jan 2020 13:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39010 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39010@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157840406725460 (code B ref -1); Tue, 07 Jan 2020 13:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jan 2020 13:34:27 +0000 Received: from localhost ([127.0.0.1]:47530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iop07-0006ca-G7 for submit@debbugs.gnu.org; Tue, 07 Jan 2020 08:34:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:33138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iop05-0006cS-R1 for submit@debbugs.gnu.org; Tue, 07 Jan 2020 08:34:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47254) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iop03-0000Ll-M8 for guix-patches@gnu.org; Tue, 07 Jan 2020 08:34:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iop02-0006Zv-GM for guix-patches@gnu.org; Tue, 07 Jan 2020 08:34:23 -0500 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:56542) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iop02-0006Wz-An; Tue, 07 Jan 2020 08:34:22 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47sYJ63PK4z1rXPd; Tue, 7 Jan 2020 14:34:14 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47sYJ61rHxz1qqkQ; Tue, 7 Jan 2020 14:34:14 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id KYNJ16D-Q0Ip; Tue, 7 Jan 2020 14:34:13 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-53-177.dynamic.mnet-online.de [188.174.53.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Tue, 7 Jan 2020 14:34:13 +0100 (CET) Received: from lenashee.fritz.box (lenashee.fritz.box [192.168.110.31]) by hermia.goebel-consult.de (Postfix) with ESMTP id B784B6031D; Tue, 7 Jan 2020 14:34:12 +0100 (CET) From: Hartmut Goebel Date: Tue, 7 Jan 2020 14:34:10 +0100 Message-Id: <20200107133410.24810-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Ludovic Courtès 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 . - (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)))