From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mFUECZXm92TJlwAAauVa8A:P1 (envelope-from ) for ; Wed, 06 Sep 2023 04:40:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id mFUECZXm92TJlwAAauVa8A (envelope-from ) for ; Wed, 06 Sep 2023 04:40:21 +0200 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 B606A3994A for ; Wed, 6 Sep 2023 04:40:20 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=Y14XAQtP; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693968021; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: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:dkim-signature; bh=4Lnqhcl06XNrecvvZiR/+kmZV+S3p9vQ6+Ff6I3IRjY=; b=WaM026mw2VqZ6kDGD4iP/e0Bfko8PGwKuQVeUFaf/LyeW+Sl4oyoGSx9i7vvjOTYoEUHgV ZYd1j48Z0tlEh23PWSiY/X9fY2DijKztV/9Yj0+nfRIl5mAGkmKhh/ARx1uPPeQopiBgdn 2vnKVPYrQZGctDupe7cc18cPghaWYk7gkRhrjadwzv5ifegsPFShEggzo/bR6KXD3OCbrS eCt42JHNvJO4Uis2J7OrVOPUY+uacqk6EmAP18SSB5H0fTeORo2DgVKE/svNJmPPoev7r5 9xdItIYdIyEyr/JfVAdfCyOCZctLOFjomYgieBfUFG8/iHcfLJgEhoQDaiBnqw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693968021; a=rsa-sha256; cv=none; b=gvSXf+2PQM5Om2Qn6Y0SSG1BqVzDFaYufNKaQ5FOcmejmm+RvjSL9xa4DuNPWmWO1C3HmY buZBI04wGHGCSdktzQaDSW9ECiKCZcbBTBi1RaT8dxYDzCULwyWZc6i0THoynYik9z0HD8 jHu529mnCAZJM/oJZhAzYnW7t8hlZ/Sova0BMOonZBuHDa4a+SaM2qQ3lsG+8oM7G9GSSI 0tAAz8iQW4zi0gB9GGYeCWrOGcdHM3Ek32jEk40291dlJ3f0O52AxDnTNg7JW4qcyDAV2m fmLL6GpRM/9cZQXbxeQEdVWVfVmbAIkFOa9dKU2m/+4OirJSu/Km102xCCUBIQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=Y14XAQtP; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdiSY-0007Bg-MY; Tue, 05 Sep 2023 22:40:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qdiSX-0007Az-DP for guix-patches@gnu.org; Tue, 05 Sep 2023 22:40:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qdiSX-0000n8-4X for guix-patches@gnu.org; Tue, 05 Sep 2023 22:40:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdiSX-00041Y-JW for guix-patches@gnu.org; Tue, 05 Sep 2023 22:40:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65352] Fix time-machine and network Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 02:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65352 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Simon Tournier Cc: 65352@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 65352-submit@debbugs.gnu.org id=B65352.169396796115416 (code B ref 65352); Wed, 06 Sep 2023 02:40:01 +0000 Received: (at 65352) by debbugs.gnu.org; 6 Sep 2023 02:39:21 +0000 Received: from localhost ([127.0.0.1]:60306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdiRt-00040a-A9 for submit@debbugs.gnu.org; Tue, 05 Sep 2023 22:39:21 -0400 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]:54350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdiRq-00040M-9X for 65352@debbugs.gnu.org; Tue, 05 Sep 2023 22:39:20 -0400 Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-4135d72c75bso21451491cf.0 for <65352@debbugs.gnu.org>; Tue, 05 Sep 2023 19:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693967951; x=1694572751; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=4Lnqhcl06XNrecvvZiR/+kmZV+S3p9vQ6+Ff6I3IRjY=; b=Y14XAQtPlelo1gy10VHGzjBpm9ToDGrDc/jm7DsyMu6fDb6+HZUIHK8JIUbgln6Gd0 xoSacYaAUYyGTASjIyX562nw/HUBadv2NiBG+vYDf16vjtjqmXAEexytaaYXJJCq0EET vvAcDz5Q/YjgcEx3yQ/xqHmdmKiHzhX8D/zpvsI2+98Zi4kD8Wwi8EUOO4YDTtUOmclB 9QcpvYnRIhyKHbk3/oQ6+0cLXzvhEgajNaaoYVr1S8GDCIOP9MrqDO7TQlMLX81KU7mW Zb35YYSy+XLoSAbqFo0b19Y0YvApdTHVEwMwpjnOYbyg0ieM+ApCT9ijRh57lNOm43Ex 7l/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693967951; x=1694572751; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4Lnqhcl06XNrecvvZiR/+kmZV+S3p9vQ6+Ff6I3IRjY=; b=LE98a2of/HooX4aoKIpjYyaHm+b+60lnlzbkzbGJ8bLBN51SxRlt7djJIE5N2oiVT2 AxfAjB4P+PivuadhJeG9rnGNbGCCnjlEz9haXQ+a++DTwzjD562jyXDZJtDOmxmdSabC CvKlma+ZPc/r5RYIrF65RyvP3P5zNdZIf2VF9bphHPuJbuLry9mbtPAviZ8qhvNyNMZK HeMRlFOH+PdxTxAMe8LE3E74NbWAKN1+yrAW3j5M7ohegk+Mt83hKQ7vFOI/AmFFDGqC neE2ktxzeKzAqLe3yw98GIFsOdFVe0UhHNuKXSpXl+9j3HUHRNjPBcNMZV9MKrzaYRbU pHGw== X-Gm-Message-State: AOJu0Yyb3hpPLJ51yokS3413CGSZGcvHbGlfkGRfc9XidGSxaiX6d0bc c213cyvwZzlXXEurDMXsN2C1nckPIG9AmQ== X-Google-Smtp-Source: AGHT+IFF1A7P3ro6E+uPPGGHbulIz1HgNQK/1A+/M0F63+kpYzd9MwvN3iZ3gL2tlVJHRGmm75Xm0g== X-Received: by 2002:a05:620a:44d1:b0:76e:f2cc:294f with SMTP id y17-20020a05620a44d100b0076ef2cc294fmr17952819qkp.63.1693967951504; Tue, 05 Sep 2023 19:39:11 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id pi16-20020a05620a379000b0076f0744ff50sm4542582qkn.136.2023.09.05.19.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 19:39:10 -0700 (PDT) From: Maxim Cournoyer References: <87fs4h4vb9.fsf@gmail.com> <87o7iiqo6d.fsf_-_@gnu.org> <87y1hkfj7j.fsf_-_@gmail.com> <864jk8qqz8.fsf@gmail.com> Date: Tue, 05 Sep 2023 22:39:09 -0400 In-Reply-To: <864jk8qqz8.fsf@gmail.com> (Simon Tournier's message of "Tue, 05 Sep 2023 22:56:11 +0200") Message-ID: <874jk8dnzm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Spam-Score: -5.12 X-Migadu-Queue-Id: B606A3994A X-Migadu-Spam-Score: -5.12 X-TUID: AZxEa1AQhW0Q Hi, Simon Tournier writes: > Hi Maxim, > > On Tue, 05 Sep 2023 at 16:39, Maxim Cournoyer = wrote: > >> I've reviewed this thread and the code, and I agree. This is a special >> case. I've added a comment so we aren't tempted to use >> 'resolve-reference' there again. > > I disagree. There is no special case. The culprit is the procedure > =E2=80=99validate-guix-channel=E2=80=99 as explained in: I was referring to the special case of resolved-reference? (that it mustn't trust tags or branches in a git cache -- at least currently, compared to resolve-reference. Maybe we want to change that? > [bug#65352] Fix time-machine and network > Simon Tournier > Mon, 04 Sep 2023 19:37:08 +0200 > id:87wmx5on5n.fsf@gmail.com > https://issues.guix.gnu.org//65352 > https://issues.guix.gnu.org/msgid/87wmx5on5n.fsf@gmail.com > https://yhetil.org/guix/87wmx5on5n.fsf@gmail.com > > >> Will install shortly. > > I do not know what you will install shortly. The fix belong to > validate-guix-channel, something like: > > (let* ((guix-channel (find guix-channel? channels)) > (reference (or ref > (match (channel-commit guix-channel) > (#f `(branch . ,(channel-branch guix-cha= nnel))) > (commit `(tag-or-commit . ,commit))))) > (checkout commit relation (update-cached-checkout > (channel-url guix-channel) > #:ref reference > #:starting-commit > %oldest-possible-commit))) > > and that would avoid to break the =E2=80=9Ccontract=E2=80=9D of resolve-r= eference. > Before committing something, I was testing. That's orthogonal to the other issue discussed, right? What I was referring to about 'installing' was c3d48d02, which implements the above (with let-bound variables and 'if' instead of match, but the logic is the same). I feel like we need to agree on what reference-available? is supposed to achieve, and where it needs to differentiate from resolve-reference. --=20 Thanks, Maxim