From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0p/NGHbqZmAbPgEAgWs5BA (envelope-from ) for ; Fri, 02 Apr 2021 11:57:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id cAaOD3bqZmDBfwAAbx9fmQ (envelope-from ) for ; Fri, 02 Apr 2021 09:57:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B2698A66C for ; Fri, 2 Apr 2021 11:57:09 +0200 (CEST) Received: from localhost ([::1]:40968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSGY8-0007Jq-QC for larch@yhetil.org; Fri, 02 Apr 2021 05:57:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSGY2-0007Jh-FU for bug-guix@gnu.org; Fri, 02 Apr 2021 05:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47650) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lSGY2-0008KM-8R for bug-guix@gnu.org; Fri, 02 Apr 2021 05:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lSGY2-0001XF-7E for bug-guix@gnu.org; Fri, 02 Apr 2021 05:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#44593: (guix git) =?UTF-8?Q?doesn=E2=80=99t?= honor HTTP/HTTPS proxy settings for submodules Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 02 Apr 2021 09:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44593 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 44593@debbugs.gnu.org Received: via spool by 44593-submit@debbugs.gnu.org id=B44593.16173573915859 (code B ref 44593); Fri, 02 Apr 2021 09:57:02 +0000 Received: (at 44593) by debbugs.gnu.org; 2 Apr 2021 09:56:31 +0000 Received: from localhost ([127.0.0.1]:59196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSGXW-0001WR-Vg for submit@debbugs.gnu.org; Fri, 02 Apr 2021 05:56:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSGXU-0001WB-P6 for 44593@debbugs.gnu.org; Fri, 02 Apr 2021 05:56:29 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49381) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSGXP-0007ma-Fm for 44593@debbugs.gnu.org; Fri, 02 Apr 2021 05:56:23 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=60414 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lSGXO-0003tB-HD for 44593@debbugs.gnu.org; Fri, 02 Apr 2021 05:56:22 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87h7puk72m.fsf@inria.fr> <87wnvvhjfr.fsf@gnu.org> Date: Fri, 02 Apr 2021 11:56:20 +0200 In-Reply-To: <87wnvvhjfr.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Fri, 29 Jan 2021 16:06:00 +0100") Message-ID: <87v9952env.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617357429; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=g6spXyEprp4ILgKpZ2+iATOTcjggz/68BAgckmXtCoM=; b=XpGQBEW2/RvYgpzyIN1qgfnqNguPRNnihEn8pCK6F4kJYHXmDZRBeuYqoB26Gy99DiTm6g R1ZlOibEN3rUYeJtKD8mlqSRBoHXrlnF8lCWFjbAxN9FV7kq/2B5d5T1hnznnRnWei/Cuq 42GY2s9ENwyUqz29dK9l4mY1iO+Wi5V8ojzcLFjiZLUWmiCLt2w5qYE6dmTCnlEzpY+8Qm ysGSFUz9nPVU8CsCBsBepprqJj79tGamZUftShCQj9ejTSfZ9o1pzqNM73x3GklngocEEF qY59IEZSQkk9sZpe6JChs5vL0xcvouu2FUXS401zhT5/njyfR61xW0nQ0dj+wQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617357429; a=rsa-sha256; cv=none; b=ce/DhMEH53dW/Nbzl3EwwXzR42goXQ+lt3nB1CatJfkyDL94gS0R/V2l8UhThDJX+66cxQ qr/vF0A8+F/t71k9qmSTSWeaDdcZtdQwebk0C7Xs7EvA801OrNr0iUQ++5lzvU/hVIZUuG HNrYPe15JVhDUZNWBAND/Agvp88Xg5bPiUOodDxFsyqnEh6M3N67hx68UCCWKekO8DtXXJ rGwlOr01On2yJAbJMYEautW6pxUVViAhVgcPuH6gOkP09K3YHXnII6ZRE8Sw/y59avrM5i C964yrTj6kfnlXC2Mj1xeNAetEZ6OU29ut9W/P5q8deJB2O6dYck5ym4SWQvOQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -2.93 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: B2698A66C X-Spam-Score: -2.93 X-Migadu-Scanner: scn0.migadu.com X-TUID: ueDZKpZTm87R --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s skribis: > Ludovic Court=C3=A8s skribis: > >> (guix git) does not honor proxy settings when fetching submodules. >> >> In fact, Guile-Git 0.4.0 doesn=E2=80=99t allow us to pass fetch options = to >> =E2=80=98submodule-update=E2=80=99, which is what needs to be fixed firs= t. > > Implemented here: > > https://gitlab.com/guile-git/guile-git/-/commit/6c512f7a4d14814a306b9c9= 7b53373527d9a6c50 > > Unfortunately I couldn=E2=80=99t come up with a good test to ensure the f= etch > options are honored by =E2=80=98submodule-update=E2=80=99, as noted there. And here=E2=80=99s the (guix git) patch, to commit when the new Guile-Git release is out. Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/guix/git.scm b/guix/git.scm index 1820036f25..ed00a50df9 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -279,13 +279,15 @@ dynamic extent of EXP." (report-git-error err)))) (define* (update-submodules repository - #:key (log-port (current-error-port))) + #:key (log-port (current-error-port)) + (fetch-options #f)) "Update the submodules of REPOSITORY, a Git repository object." (for-each (lambda (name) (let ((submodule (submodule-lookup repository name))) (format log-port (G_ "updating submodule '~a'...~%") name) - (submodule-update submodule) + (submodule-update submodule + #:fetch-options fetch-options) ;; Recurse in SUBMODULE. (let ((directory (string-append @@ -293,6 +295,7 @@ dynamic extent of EXP." "/" (submodule-path submodule)))) (with-repository directory repository (update-submodules repository + #:fetch-options fetch-options #:log-port log-port))))) (repository-submodules repository))) @@ -391,7 +394,8 @@ it unchanged." (remote-fetch (remote-lookup repository "origin") #:fetch-options (make-default-fetch-options))) (when recursive? - (update-submodules repository #:log-port log-port)) + (update-submodules repository #:log-port log-port + #:fetch-options (make-default-fetch-options))) ;; Note: call 'commit-relation' from here because it's more efficient ;; than letting users re-open the checkout later on. --=-=-=--