From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 08 14:54:14 2020 Received: (at submit) by debbugs.gnu.org; 8 Jun 2020 18:54:14 +0000 Received: from localhost ([127.0.0.1]:57921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiMuT-00026j-UE for submit@debbugs.gnu.org; Mon, 08 Jun 2020 14:54:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:51968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiMuS-00026c-9y for submit@debbugs.gnu.org; Mon, 08 Jun 2020 14:54:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiMuS-0004gb-1G for bug-guix@gnu.org; Mon, 08 Jun 2020 14:54:12 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:45955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiMuP-0004UU-Qm for bug-guix@gnu.org; Mon, 08 Jun 2020 14:54:10 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id E57A45C00B4; Mon, 8 Jun 2020 14:54:06 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 08 Jun 2020 14:54:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:subject:message-id:mime-version:content-type; s= mesmtp; bh=DWYoa9/sJ3y3msc/JLK208EJ3iigP9AZkNpKyfh+vZ0=; b=Be39d 9ro4CJWeo3gB97bO5qLLoKY8vdpTLZEZ+oM1zRsfBaYb/0h6zWLya8bM5jzHNqb+ nYIf9WpfNZxN2BfXt0ZiEYyEMbf32vHABs5r6FD05pQZvleBeFxNsXXcCtbnjU+5 L+VACEvvAgJwnZTCCYg8j2YR5SHM/UqwrYNhtM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=DWYoa9/sJ3y3msc/JLK208EJ3iigP 9AZkNpKyfh+vZ0=; b=DSfSeVm3EvcJzKEqQTA6MI8ng275wC3xg7e0hQQUj24hT iWXDcjKTezjGDRyxZLhGNEhjZl8WelR73B5nrQknK4q3aKY9iRp1jF93pajJLea9 hNavKN/HcIaCxSgTlcNH/bz8tRwQya6+789Rn/vGSwMhkI39cNgdIymHVrX7lPqZ lCr/LuJDrVHPlW3oqTfXwTCuG47n4rIbyUi3s+kHW7Bk1I0tnHG8Iyfxdk/qKe+q mXNTlROvbIF9dcjQrGLLYmTFG+1HJJ8WBXchhVgU2Id2KK1feF8C8ghx3RB+BAbP u8XzoPopineXrrfbHNKrFw/W3fQxp1w6oJ8ZWZrjw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudehvddgjedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkgggtugesthdtredttd dtvdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhi rdhnrghmvgeqnecuggftrfgrthhtvghrnhepffehtdeffedtvdeuieefudeujedvkeehff euieejgfdvteelgeehgeefheehuddunecukfhppeejiedruddvgedrudefkedrieefnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfh grmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 6B25430618B7 for ; Mon, 8 Jun 2020 14:54:06 -0400 (EDT) Date: Mon, 8 Jun 2020 14:54:04 -0400 From: Leo Famulari To: bug-guix@gnu.org Subject: `make authenticate` fails to find the keyring branch Message-ID: <20200608185404.GA2356@jasmine.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=66.111.4.28; envelope-from=leo@famulari.name; helo=out4-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/08 14:48:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) I just tried pushing for the first time since installing the new pre-push hook that runs `make authenticate`. This failed with the following error: Git error: cannot locate remote-tracking branch 'keyring' However, `git branch --all` includes "remotes/origin/keyring". After I did `git checkout origin/keyring`, it worked. Let's update the manual section Commit Access with the recommended way to make this branch accessible to `make authenticate`. Maybe it should even do it automatically? From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 09 12:16:08 2020 Received: (at 41764) by debbugs.gnu.org; 9 Jun 2020 16:16:08 +0000 Received: from localhost ([127.0.0.1]:60739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jigv2-00057k-Fm for submit@debbugs.gnu.org; Tue, 09 Jun 2020 12:16:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jigv1-00057I-HP for 41764@debbugs.gnu.org; Tue, 09 Jun 2020 12:16:07 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44818) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiguw-0006hu-8h; Tue, 09 Jun 2020 12:16:02 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=34584 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jiguv-0002sA-Cu; Tue, 09 Jun 2020 12:16:01 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Leo Famulari Subject: Re: bug#41764: `make authenticate` fails to find the keyring branch References: <20200608185404.GA2356@jasmine.lan> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 22 Prairial an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 09 Jun 2020 18:16:00 +0200 In-Reply-To: <20200608185404.GA2356@jasmine.lan> (Leo Famulari's message of "Mon, 8 Jun 2020 14:54:04 -0400") Message-ID: <87img0gqpr.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41764 Cc: 41764@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Leo Famulari skribis: > I just tried pushing for the first time since installing the new > pre-push hook that runs `make authenticate`. > > This failed with the following error: > > Git error: cannot locate remote-tracking branch 'keyring' > > However, `git branch --all` includes "remotes/origin/keyring". > > After I did `git checkout origin/keyring`, it worked. Right, since commit 512b9e2da26968ebafdd47f701edd8fc3936d3e8, you have to have a local =E2=80=98keyring=E2=80=99 branch. > Let's update the manual section Commit Access with the recommended way > to make this branch accessible to `make authenticate`. Maybe it should > even do it automatically? I don=E2=80=99t think it can do it automatically because it cannot guess wh= at the remote is called (Tobias reported an issue earlier because =E2=80=9Corigin/keyring=E2=80=9D was hard-coded and Tobias didn=E2=80=99t h= ave an =E2=80=9Corigin=E2=80=9D remote.) Regarding documentation, do you think it would suffice to say that one needs to have a local =E2=80=98keyring=E2=80=99 branch tracking upstream=E2= =80=99s? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 07 08:33:34 2020 Received: (at 41764) by debbugs.gnu.org; 7 Aug 2020 12:33:34 +0000 Received: from localhost ([127.0.0.1]:56110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k41Z0-0002rU-GB for submit@debbugs.gnu.org; Fri, 07 Aug 2020 08:33:34 -0400 Received: from sender4-of-o56.zoho.com ([136.143.188.56]:21608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k41Yw-0002rK-In for 41764@debbugs.gnu.org; Fri, 07 Aug 2020 08:33:33 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1596803607; cv=none; d=zohomail.com; s=zohoarc; b=fggY/AM4G7Cwyk/9Y/C5Jdwd24IrwbhfwFgVUXdPO0nrgxV8UgvMnrDcSaxy1bcOv+2zwVSgU4FnmDF5IuSIJ7fVY+Vy/BDr8pY6sk1JvDWM8NMQxKHwarw1V8W7UjlglFJOn/Xr1Hd97VB7gXjAFQQNX23DpOw/TDESz4U7UCQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596803607; h=Content-Type:Date:From:MIME-Version:Message-ID:Subject:To; bh=2jSLuVhB44mGyC8KT9uZxo+tDJ9aGNvv+CdBrhv17v8=; b=LZPbpLEB+iCABUqnYKOVFhdU4nbsx/WxMJUN9Y4+nFbmUwlYEZQbEGldxETvaFToxsL3STmqhrBopdV4eihBz7AxyMT/GJaOZPz0vdQcvPVcOKZusK0ii0ro/bTGXVlnRDLxviVpKMrRxDjTKvIazEQnNMbIZ8/3eFSCIkuxGSs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=issues.guix.gnu.org@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1596803607; s=zoho; d=elephly.net; i=issues.guix.gnu.org@elephly.net; h=MIME-Version:Content-Type:From:To:Date:Message-ID:Subject; bh=2jSLuVhB44mGyC8KT9uZxo+tDJ9aGNvv+CdBrhv17v8=; b=dYprLSvx37MgPerfLXDsStef0QvIW1PlIyd77xlO4Q8JEtLD2SXtnNWhT0+WcqS1 vAbLeLkFUmaAyJ8U0s1nnWqW8f4uErsLyFHqX8uppLvr2W299dB/PmG5B9UCyzoRCTR l46hnbcX4flmDpO2TqszCJ3yUiF0QCgYfx6IR6KM= Received: from localhost (185.220.101.200 [185.220.101.200]) by mx.zohomail.com with SMTPS id 1596803602936814.7392864267331; Fri, 7 Aug 2020 05:33:22 -0700 (PDT) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 From: guix-vits via web To: 41764@debbugs.gnu.org Date: Fri, 7 Aug 2020 14:33:07 +0200 Message-ID: <7fc08cc00770.12ef49168b33d84b@guile.gnu.org> Subject: `make authenticate` fails to find the keyring branch X-ZohoMailClient: External X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Please do :) Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [136.143.188.56 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [136.143.188.56 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 3.0 AC_FROM_MANY_DOTS Multiple periods in From user name X-Debbugs-Envelope-To: 41764 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Please do :) From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 24 08:51:02 2020 Received: (at 41764) by debbugs.gnu.org; 24 Oct 2020 12:51:02 +0000 Received: from localhost ([127.0.0.1]:32925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWJ0f-0006I5-MC for submit@debbugs.gnu.org; Sat, 24 Oct 2020 08:51:02 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:37667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWJ0b-0006Hh-TH for 41764@debbugs.gnu.org; Sat, 24 Oct 2020 08:51:00 -0400 Received: by mail-wm1-f46.google.com with SMTP id c16so5563448wmd.2 for <41764@debbugs.gnu.org>; Sat, 24 Oct 2020 05:50:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=6jHkWfJs4l5mqsfhDlM2R8K1UjgWx2u1NJiXLFtIrr8=; b=YhWK2EhYeYavyGor4ZdgQ6kgwkMYue9ploRaYmr7p82xaFRw7+k/gRhkfU1dIBpZzG 8/oblF+hkZJXpCf4yG5+SyLSi8TcH/1TINICEIkz+3/dF+B7VpI7HeZnwbPq2hrJ5OBt MdMVdWVmB9tJiOjiHUWzTnOelhqV5gogRIJZ0UbYtBJZ/xFfulpNjjPb/ghVLo1umr7X w7O/5XYU+0Vk5JGkelbTdMBzcy6qGGOCagTgilDlRRijUvXYD6lElzR24HCdmVNmseXj 3G0iP7YLqelWFUkasmaeq62gSjrqvfOIsCtrsPY+ioathsSpB/uFYH5dFxAcAHZm23DK 2iYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=6jHkWfJs4l5mqsfhDlM2R8K1UjgWx2u1NJiXLFtIrr8=; b=oT5XscCGA179nNw1jecCiO5Yf2enFyhPgdDWhe8AeWp4OgbJ/wogKQkGGGVy46s+l4 Xv0Qfslf0aNFxZ91FO0caQx71ZX9aY77FZhTAEhjcl1JK0mQNgsBnaR9qKBw3vzEoROB YUulovsJQLyb5yH+8oAejzzE8p/T5/g7AgNomwz2RBTzqmh3YzJqQfu/G2NgiiHdgEoG rF0uwzpIrQ4GvN+isXLlwTOyzgS1wABJvTdSefTp/PQrzGa4qzqs9aN0zfZmg3FxyIgp ReBbY+iTQuWrPB98/RktWxvV5SNoHPnef2hJKJR/LFDwai4r959nPgGK3cT+2BPhxNOV hdDg== X-Gm-Message-State: AOAM532Av21n6dBntC0Xj544vZ2+XbDwfccgiTnzvgWIWX49NXaBg4Mx C+Zq04b3lb635KqgL3QkHhoW6Z5+DhjqDw== X-Google-Smtp-Source: ABdhPJy/gjSLDSbt+pbp3Pxf20dUnnlTGpzUhHuHBmW2c1WmJr40b5cY5OT9sBOYxYYGw8j3upypYA== X-Received: by 2002:a1c:740f:: with SMTP id p15mr6709994wmc.106.1603543851554; Sat, 24 Oct 2020 05:50:51 -0700 (PDT) Received: from unfall (218.139.134.37.dynamic.jazztel.es. [37.134.139.218]) by smtp.gmail.com with ESMTPSA id c129sm10239431wmd.7.2020.10.24.05.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 05:50:50 -0700 (PDT) From: =?utf-8?Q?Miguel_=C3=81ngel_Arruga_Vivas?= To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#41764: `make authenticate` fails to find the keyring branch References: <20200608185404.GA2356@jasmine.lan> <87img0gqpr.fsf@gnu.org> Date: Sat, 24 Oct 2020 14:49:43 +0200 In-Reply-To: <87img0gqpr.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Tue, 09 Jun 2020 18:16:00 +0200") Message-ID: <87v9ezhjq0.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 41764 Cc: 41764@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Ludovic Court=C3=A8s writes: > Hi, > > Leo Famulari skribis: > >> I just tried pushing for the first time since installing the new >> pre-push hook that runs `make authenticate`. >> >> This failed with the following error: >> >> Git error: cannot locate remote-tracking branch 'keyring' >> >> However, `git branch --all` includes "remotes/origin/keyring". >> >> After I did `git checkout origin/keyring`, it worked. > > Right, since commit 512b9e2da26968ebafdd47f701edd8fc3936d3e8, you have > to have a local =E2=80=98keyring=E2=80=99 branch. I've hit this too... >> Let's update the manual section Commit Access with the recommended way >> to make this branch accessible to `make authenticate`. Maybe it should >> even do it automatically? > > I don=E2=80=99t think it can do it automatically because it cannot guess = what > the remote is called (Tobias reported an issue earlier because > =E2=80=9Corigin/keyring=E2=80=9D was hard-coded and Tobias didn=E2=80=99t= have an =E2=80=9Corigin=E2=80=9D > remote.) I'd say this isn't really a solution: hard-coding the origin is bad but not the branch name? Someone who wants to have a local branch called keyring for whatever reason will have the exact same problem. From=20my POV, "origin/keyring" should be the *default*, as only people modifying its contents should have a local branch pointing to it, but the moment you name it hard- instead of normal-code you can clearly say there's a configuration need. :-) The attached patch exposes a variable for make called GUIX_GIT_KEYRING to provide the keyring reference to guix git authenticate, including an example in the manual, as everything else is already there. WDYT? Happy hacking! Miguel --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-build-Add-GUIX_GIT_KEYRING-variable-for-make-authent.patch Content-Transfer-Encoding: quoted-printable Content-Description: 0001-build-Add-GUIX_GIT_KEYRING-variable-for-make-authent.patch From=20479ac6846cb228b67b778965f0f5299ea3172424 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Miguel=3D20=3DC3=3D81ngel=3D20Arruga=3D20Vivas?=3D Date: Sat, 24 Oct 2020 14:35:09 +0200 Subject: [PATCH] build: Add GUIX_GIT_KEYRING variable for make authenticate. * Makefile.am (GUIX_GIT_KEYRING): New variable. (authenticate): Use GUIX_GIT_KEYRING to select the keyring branch reference. * doc/contributing.texi (Building from Git): Add an example about the use of GUIX_GIT_KEYRING. =2D-- Makefile.am | 2 ++ doc/contributing.texi | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/Makefile.am b/Makefile.am index c509562567..e6cef9ec1a 100644 =2D-- a/Makefile.am +++ b/Makefile.am @@ -666,9 +666,11 @@ channel_intro_commit =3D 9edb3f66fd807b096b48283debdcd= dccfea34bad channel_intro_signer =3D BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA =20 # Authenticate the current Git checkout by checking signatures on every co= mmit. +GUIX_GIT_KEYRING =3D origin/keyring authenticate: $(AM_V_at)echo "Authenticating Git checkout..." ; \ guix git authenticate \ + --keyring=3D$(GUIX_GIT_KEYRING) \ --cache-key=3Dchannels/guix --stats \ "$(channel_intro_commit)" "$(channel_intro_signer)" =20 diff --git a/doc/contributing.texi b/doc/contributing.texi index 26a4627464..9312faa849 100644 =2D-- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -140,6 +140,16 @@ make authenticate =20 The first run takes a couple of minutes, but subsequent runs are faster. =20 +Or, when your configuration for your local git repository doesn't match +the default one, you can provide the reference for the @code{keyring} +branch through the variable @code{GUIX_GIT_KEYRING}. The following +example assumes that you have a git remote called @samp{myremote} +pointing to the official repository: + +@example +make authenticate GUIX_GIT_KEYRING=3Dmyremote/keyring +@end example + @quotation Note You are advised to run @command{make authenticate} after every @command{git pull} invocation. This ensures you keep receiving valid =2D-=20 2.28.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCgAdFiEEiIeExBRZrMuD5+hMY0xuiXn6vsIFAl+UIugACgkQY0xuiXn6 vsIDJAv+IEwSdiHrdzeswwo+9I4UZUJGTPt7LCuD4KiflLZrJkJKxhjqIQia1h9G oiqq4OBprKSQKz7h4NHLCFmMck6kRszZ8IBJUSvTsHPfeOxpZf3NytjOOLJZBXQV nEAewPi+QrTprwzbajxgJtQdiEKBDno2RdXwMaTHxgRkQCS/LPmCo50AYzago6qg frOWBp4x8QjcwVuJ5XajmfyJB/gplQq2g2wVvduWq26uUxo+vcHIlUtiSeqySycr ygj4pIlkXoiyouP0zcABXiu8Ktk1vHRIOf0DvSld46+McBZMEQx/ZVeVhRFV3+rq LgpgcOgufZdON8MEqu0dRYOn3WtMQnSEYtWUPVBBgCdUyTDOcGkSXZ99D32KO10j wbILpFVXB/iC/cbJCFwt8O255tCmAWKA0a7filwmi6QWefM+fzQOMVAA1+6ew7l4 /O4bS/xJGDeAjudXPKiPSMn2GByQnSVmZiXtc4BN/e3Txcja3Rr1oT7XxWpg2/j0 7oS8qIF1 =ktyF -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 24 11:02:38 2020 Received: (at 41764) by debbugs.gnu.org; 24 Oct 2020 15:02:38 +0000 Received: from localhost ([127.0.0.1]:34282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWL42-0001ZF-DN for submit@debbugs.gnu.org; Sat, 24 Oct 2020 11:02:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWL41-0001Z4-1Y for 41764@debbugs.gnu.org; Sat, 24 Oct 2020 11:02:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47872) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWL3v-0008BD-C1; Sat, 24 Oct 2020 11:02:31 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51806 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kWL3u-0005NL-2U; Sat, 24 Oct 2020 11:02:30 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Miguel =?utf-8?Q?=C3=81ngel?= Arruga Vivas Subject: Re: bug#41764: `make authenticate` fails to find the keyring branch References: <20200608185404.GA2356@jasmine.lan> <87img0gqpr.fsf@gnu.org> <87v9ezhjq0.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Brumaire an 229 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 24 Oct 2020 17:02:28 +0200 In-Reply-To: <87v9ezhjq0.fsf@gmail.com> ("Miguel =?utf-8?Q?=C3=81ngel?= Arruga Vivas"'s message of "Sat, 24 Oct 2020 14:49:43 +0200") Message-ID: <87h7qjk6pn.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41764 Cc: 41764@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Miguel =C3=81ngel Arruga Vivas skribis: > From 479ac6846cb228b67b778965f0f5299ea3172424 Mon Sep 17 00:00:00 2001 > From: =3D?UTF-8?q?Miguel=3D20=3DC3=3D81ngel=3D20Arruga=3D20Vivas?=3D > > Date: Sat, 24 Oct 2020 14:35:09 +0200 > Subject: [PATCH] build: Add GUIX_GIT_KEYRING variable for make authentica= te. > > * Makefile.am (GUIX_GIT_KEYRING): New variable. > (authenticate): Use GUIX_GIT_KEYRING to select the keyring branch > reference. > * doc/contributing.texi (Building from Git): Add an example about the > use of GUIX_GIT_KEYRING. > --- > Makefile.am | 2 ++ > doc/contributing.texi | 10 ++++++++++ > 2 files changed, 12 insertions(+) > > diff --git a/Makefile.am b/Makefile.am > index c509562567..e6cef9ec1a 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -666,9 +666,11 @@ channel_intro_commit =3D 9edb3f66fd807b096b48283debd= cddccfea34bad > channel_intro_signer =3D BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 5= 4FA >=20=20 > # Authenticate the current Git checkout by checking signatures on every = commit. > +GUIX_GIT_KEYRING =3D origin/keyring You need =E2=80=9C?=3D=E2=80=9D or users won=E2=80=99t be able to override = it. > authenticate: > $(AM_V_at)echo "Authenticating Git checkout..." ; \ > guix git authenticate \ > + --keyring=3D$(GUIX_GIT_KEYRING) \ > --cache-key=3Dchannels/guix --stats \ > "$(channel_intro_commit)" "$(channel_intro_signer)" >=20=20 > diff --git a/doc/contributing.texi b/doc/contributing.texi > index 26a4627464..9312faa849 100644 > --- a/doc/contributing.texi > +++ b/doc/contributing.texi > @@ -140,6 +140,16 @@ make authenticate >=20=20 > The first run takes a couple of minutes, but subsequent runs are faster. >=20=20 > +Or, when your configuration for your local git repository doesn't match > +the default one, you can provide the reference for the @code{keyring} > +branch through the variable @code{GUIX_GIT_KEYRING}. The following > +example assumes that you have a git remote called @samp{myremote} > +pointing to the official repository: > + > +@example > +make authenticate GUIX_GIT_KEYRING=3Dmyremote/keyring > +@end example s/git/Git/ in the paragraph, but otherwise LGTM! =E2=80=98origin/keyring= =E2=80=99 is certainly a better default than =E2=80=98keyring=E2=80=99. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 24 11:43:00 2020 Received: (at 41764-done) by debbugs.gnu.org; 24 Oct 2020 15:43:01 +0000 Received: from localhost ([127.0.0.1]:34363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWLh6-0002ZB-N4 for submit@debbugs.gnu.org; Sat, 24 Oct 2020 11:43:00 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:35741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWLh4-0002Yq-Aj for 41764-done@debbugs.gnu.org; Sat, 24 Oct 2020 11:42:59 -0400 Received: by mail-wm1-f44.google.com with SMTP id q5so6102464wmq.0 for <41764-done@debbugs.gnu.org>; Sat, 24 Oct 2020 08:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=McbdJZ7fOWWEGMpQnN2EUdGRkBYszJPyXL5uQQwMJe0=; b=D+fZVxHqVz4h3vE6/lQH1uCcvtEUX6bz06t0bP4NwcujxUdHzp0AQAnwZGc84ddJAh YF3mVk6VhL9uVuFMEwVVKIILkPMpn29ODhya/fw+C1NmKn53YJ5DPcp0tlPmKb7zNHV+ LFN6Ro82JtTxnYszssA2U4RapJqL3mIZXXDF6RCnRHwWlL9Fp8gqhnF2zv54qvWAgkyk FlD5h+hccl6+9iE4vtG2pYvwsBOSDRAW7kCoi38MuDjTGzbfPmUcx3bZmEZcmZByhvPu 6MLCIVVP34XuFcN2pPu3RnGB1CUPQRuT4JguMggxkM03aZKoEnHPaUrppQ994IgLKhIe FrJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=McbdJZ7fOWWEGMpQnN2EUdGRkBYszJPyXL5uQQwMJe0=; b=R5EREhFkh27an+O+1bzjd87OKk70UXcvOearz0K6wULbC1vxuxsV6V0GLnR2mLpeGf iFNfmAaggDIKxqO418WpwP+SzyAHy+k5Zh7ZxmfQftmYgqPnrRUYPgyq+15CVcLT/dIM pXYvs+VRkNSZU7ogvDz/vWpi5QYyNlLRqiFIcPx+jFIb2WN6Nxi5K5grzPtYUU0h8Ooj JXasws3Q8b+RVS4/RHer357lba3atktRFWpkjKIzxYwteIkgCzoyAhPH5Re9zKq4DCB/ hKwnaDQwkK2GINb4jk+7e5Kx5Tp4aIxv8aTUYDDs6VjPW93r+uMtKL67nqDlgqhoMeQJ veeA== X-Gm-Message-State: AOAM533Zwm0XZDhssHCfiPI9lskHLHdOOgHV5Jkw71FyEuukAn7Pt74k W+PLXeqJTABAyLfmWTGQLUVQL4P/LAoAQQ== X-Google-Smtp-Source: ABdhPJwAdnnB5qw9HUvw21zAfuLeSf7nYCbiMQsCC2oqQOEZ6VPbt1V6zaddvq4aqHQVuwROxLry4A== X-Received: by 2002:a1c:8087:: with SMTP id b129mr7484738wmd.10.1603554172356; Sat, 24 Oct 2020 08:42:52 -0700 (PDT) Received: from unfall (218.139.134.37.dynamic.jazztel.es. [37.134.139.218]) by smtp.gmail.com with ESMTPSA id p67sm11173816wmp.11.2020.10.24.08.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 08:42:51 -0700 (PDT) From: =?utf-8?Q?Miguel_=C3=81ngel_Arruga_Vivas?= To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#41764: `make authenticate` fails to find the keyring branch References: <20200608185404.GA2356@jasmine.lan> <87img0gqpr.fsf@gnu.org> <87v9ezhjq0.fsf@gmail.com> <87h7qjk6pn.fsf@gnu.org> Date: Sat, 24 Oct 2020 17:41:44 +0200 In-Reply-To: <87h7qjk6pn.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Sat, 24 Oct 2020 17:02:28 +0200") Message-ID: <87h7qjhbrb.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 41764-done Cc: 41764-done@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo, Thanks for the quick revision. Ludovic Court=C3=A8s writes: >> # Authenticate the current Git checkout by checking signatures on every= commit. >> +GUIX_GIT_KEYRING =3D origin/keyring > > You need =E2=80=9C?=3D=E2=80=9D or users won=E2=80=99t be able to overrid= e it. The macro definitions provided through the command line are equivalent to adding these definitions to the end of the file, so this wouldn't make any difference, so I leave it as only =3D. > > s/git/Git/ in the paragraph, but otherwise LGTM! =E2=80=98origin/keyring= =E2=80=99 is > certainly a better default than =E2=80=98keyring=E2=80=99. Pushed with this change as ef6596a20c to master. Happy hacking! Miguel --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCgAdFiEEiIeExBRZrMuD5+hMY0xuiXn6vsIFAl+USzgACgkQY0xuiXn6 vsKAQQv9Hk/H9169Sxmp+ggYKYLQ20hxgOGU3k/xXR3KSL4qL6TiObGGGDAdPAum D12UN4dP+vvuAo38EAKAeSyMX/rxAWyrlfnoAsj3pSogQKxuTtlI4m5+bVcFoxZ/ NQe8hVDb9g6r0ByGVzg0aItXTH0pgWAWPhWdE4R052l/yKaKJ4A5HPTHDF7qTXuy yEiyqkN3YkT0XEcqVRVjZoJHu8HLOaYi2qJb6cFhJlg3Sr01DQ/CrlgmfMxADeRA MdXrMFI1aZM/zhX7FZ7TyCzpY3ax95Sq44lgSk0WxFMTzJRY6k7mKNuE7gQod/Y/ QwB8FwHqEUSnsSvWM0CQrwUAvXjNBaVdWeHiQI6FPcwSMlB+iKbpIazCXet+q38a L3Tdw3KS0WHIe9F/AN8t/tXcehHQnuIB74J52mnkhRcAXFyEDjxWTPDVOpldjFvN hQ+zHVRmbuEpTYteoYT7mLrPJLgBADu9xWVdKgMT6yYH3rpfGLFOivqCeLdktYTa 2ZweJfw8 =aTcI -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 04:02:25 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 22 Nov 2020 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator