From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id wMfQCz2W92SIdAEA9RJhRA:P1 (envelope-from ) for ; Tue, 05 Sep 2023 22:57:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id wMfQCz2W92SIdAEA9RJhRA (envelope-from ) for ; Tue, 05 Sep 2023 22:57:33 +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 E6E565D7C0 for ; Tue, 5 Sep 2023 22:57:32 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=Js7z9iiD; 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=1693947453; 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=0AEj7qJMCI1MK38VmnES5ZwzGp5DJ91JxYww6Y7AXQQ=; b=iFZfyu+JRSvtHk4A4o/iPRMIJ6YCiu3bjcmMhYsrj2MCfhnSxRDm+NbUOwh3EpNfjNS0ro s+EwRb2vhJuf/IGmE9yNYThOoHj9IWC2phfw0+OcnDhA4BjSDIetGvBq20E2NmlptydOxI VnBtebdtcQh4IbvFQ0+fRVYRdlJunJ7IeGStq4PRjMFygPDIbFkphZjzWwHt4V6fJxJXgB GqXxfepMIAZtxOoGH6uEruQ1NbWGCKEKbi6oyFPkq7dB9ezDSl9BxMPBjTV9uLficK/tcN hDiLt9EEU9Jk/AD9US2fhCPBueVJOYHGh4me+ACptclEO+sF/w72QXQtaOkmMQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=Js7z9iiD; 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-Seal: i=1; s=key1; d=yhetil.org; t=1693947453; a=rsa-sha256; cv=none; b=jGiK57KA5+9EnbWcz3DN8+XJxFG2i6f1G0eKJdDqdEjJCnM95RChWjRFpYMPlkrMH3+F07 xkRpBtDdsv4NauwtH/rhAUqFHi0Gte3/mLwX3d5yqbO3zxk7/NBBQV9eqw0cCHOxpx8wVb eDivoe58Ied4aLOTRh5h3NjkF0ZP0ebgxQv4b7cXq8OBDLK34usLnAexD0SK6ZPEhi1tSl cm8GFz6iYj8rtmuxQiL5ag69LuMpB3XMMkuQ6+xLEfXsLYcMnBzwDg5ZSGC1LOxQjpjLdw kwMJqlAj3gxM7cgLw3o02Lhh5kb38BueOz+RNrYvmD6HQtGoyz6dV8jLkcHeJg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdd6d-0007ba-G5; Tue, 05 Sep 2023 16:57:03 -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 1qdd6c-0007Y6-5z for guix-patches@gnu.org; Tue, 05 Sep 2023 16:57:02 -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 1qdd6b-0003bA-GV for guix-patches@gnu.org; Tue, 05 Sep 2023 16:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdd6c-0001DU-44 for guix-patches@gnu.org; Tue, 05 Sep 2023 16:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65352] Fix time-machine and network Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Sep 2023 20:57:02 +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: Maxim Cournoyer , Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 65352@debbugs.gnu.org Received: via spool by 65352-submit@debbugs.gnu.org id=B65352.16939473874622 (code B ref 65352); Tue, 05 Sep 2023 20:57:02 +0000 Received: (at 65352) by debbugs.gnu.org; 5 Sep 2023 20:56:27 +0000 Received: from localhost ([127.0.0.1]:59606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdd62-0001CT-Ic for submit@debbugs.gnu.org; Tue, 05 Sep 2023 16:56:26 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:40328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdd5y-0001Bv-Er for 65352@debbugs.gnu.org; Tue, 05 Sep 2023 16:56:22 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-31c3f574ef8so391981f8f.1 for <65352@debbugs.gnu.org>; Tue, 05 Sep 2023 13:56:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693947376; x=1694552176; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0AEj7qJMCI1MK38VmnES5ZwzGp5DJ91JxYww6Y7AXQQ=; b=Js7z9iiDwBzmKONP5C9SUMS7JTzZFWueHkoFJn9LnelzVcVCXnjCWm2UdZ6N2TAX80 7WFs0cOhbyyDEmra+Ij++s0EED1/IDD9CIdvMrt94K3lNM96//nSupfSORrXRgl6Z8iy GdmOgjmzSrb/3Pu3fCNj8bFYQI/TbsrejqhUob4W9LI+DLBSGv5YiSELmHTXwrh36a4O d8QGW43F3rEuC9hwqkpDxjFamFOmk1HZcNgGGYUxnYjztSfJrEaUr284Pi5TzUk3dNNR c2J53mRBDBYlsKPua4a1eS5mq22x/BrcQvp59yC93f+WMhDAfEQueGvyZiBsqTOzNs60 nPzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693947376; x=1694552176; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0AEj7qJMCI1MK38VmnES5ZwzGp5DJ91JxYww6Y7AXQQ=; b=AM+wZJhwnoPpylER0D4NxWpjEiXIq/Lb3qEhkD770jjN9q1X/IYfyQtEKLJAEcnmAf hehiCEwnJo1G+tOiHtEQ7Y/oQF53s8zBByCckAV1m+sRwEuTaBAQQ86nKZ0bbSYkplfx kp6AlCN9B0V85ePHoD2RUQRwQKGpNAShim/d2XPcJzZROozaa0tgAsyP1poRovha30U5 VgdDP42keHa1EtSJ6b4vTJe2DRFwsEzqACc3MpauLcIiuuxlzQSazXtmLRUU4kMa+iJq Vvmmc6CvMnPM7beA0tbcxWOJWJlih461dG1VrKjKNWqJCU6fTG24j9RWeKmCb12HiaX5 /Jjg== X-Gm-Message-State: AOJu0YwZ5s5JIvP7nEOe6sUKihL8v0nxP8Lh5GHXsaI+Bbyper1TVDC7 tMmkX33CEtfMIJLOVH3gOqjCCLQHGyo= X-Google-Smtp-Source: AGHT+IF+SZE5PI8nwAd2660ATIvNwJlSm0W/8ij1nbZ0Tvt+HrrCWL1/d9rROKgWwH0c57szl98OGg== X-Received: by 2002:adf:d08d:0:b0:317:3d36:b2c1 with SMTP id y13-20020adfd08d000000b003173d36b2c1mr10284314wrh.7.1693947375714; Tue, 05 Sep 2023 13:56:15 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id y3-20020a5d4ac3000000b003141a3c4353sm18431469wrs.30.2023.09.05.13.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 13:56:15 -0700 (PDT) From: Simon Tournier In-Reply-To: <87y1hkfj7j.fsf_-_@gmail.com> References: <87fs4h4vb9.fsf@gmail.com> <87o7iiqo6d.fsf_-_@gnu.org> <87y1hkfj7j.fsf_-_@gmail.com> Date: Tue, 05 Sep 2023 22:56:11 +0200 Message-ID: <864jk8qqz8.fsf@gmail.com> 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: E6E565D7C0 X-Migadu-Spam: Yes X-Spam: Yes X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 7.59 X-Spam-Score: 7.59 X-TUID: U2jaLEkbdwtY Hi Maxim, On Tue, 05 Sep 2023 at 16:39, Maxim Cournoyer w= rote: > 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: [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-chann= el))) (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-ref= erence. Before committing something, I was testing. Cheers, simon