From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kHqNHN6QfGYyfwAAe85BDQ:P1 (envelope-from ) for ; Wed, 26 Jun 2024 22:06:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id kHqNHN6QfGYyfwAAe85BDQ (envelope-from ) for ; Thu, 27 Jun 2024 00:06:22 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=JI64yEfU; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1719439582; 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-to: 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=T/ymZUUtJ5qIV8d7fDcvIA15rMcTtCfMt3qo0mNnRRo=; b=PxZ+3iymQfEs0QdE2lAHj3X3vNnB5h5subCsyWc75nfNbgWiQHAgyuS7lmJyE7HdMLPT1b 8mfSncNRrbpNBIAQ4zt4vkSAaDt6XDtO2dDey06BLhCU/YpQMEgyGeWIaGLcphI4n/0weZ Q7zibXFhkGCG6OGKbc6BCSXXRun7jczjpMqAfHbwaBy4mJ7OobCv4SjP/wInLkBKpzHVSb ej3v/39rz1sPboWLsbyC3J6QmP8AOdQ4qF/xGWDHnnwy/w+h/3rB+dTqxKjmH6FL+GJXZL ai5zKEGwAJXXFBwXLJn9DYwxPp1YFCSEZc/Y5n/zJ635UW77lBPh5wWlJEJPlQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719439582; a=rsa-sha256; cv=none; b=H1R1v6WBqIb9uaFC9tiCpeLh2lD5LFpS9fSB593IauO/2OYmsEFcXvvy6WrkIckYq3y3qJ VAh9OYqp+J5sk0MwpSfNx9ZMWR8dYqvG96F1mnZjNf0QaXfmqM8KURs1qdVp8NIy1ofPkw tHUspBbvnaPGDgiZtOfKQ1GYHKIL0uhkgDCNmrLZs1KZ8uIQOV6Nr4DZGjtZvc3T73BqTQ 9xzzktWtATm265ZNo49vdd8PTE5BzHU/52SW2z5klEGEW7wbVK5Ae+XQw10M/wSo9K93Hx qRZxBrJGZenRY406SuapnfmqoYJekRELEV3UI4JKxn6vTLc7Yb7iAeVLd4dO2A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=JI64yEfU; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 3CC501ED74 for ; Thu, 27 Jun 2024 00:06:22 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMamD-0002xW-6v; Wed, 26 Jun 2024 18:06:05 -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 1sMam8-0002x7-LI for guix-patches@gnu.org; Wed, 26 Jun 2024 18:06:00 -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 1sMam8-0006f9-Cm for guix-patches@gnu.org; Wed, 26 Jun 2024 18:06:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sMamA-0002jO-Mv for guix-patches@gnu.org; Wed, 26 Jun 2024 18:06:02 -0400 Subject: bug#71631: [PATCH] swh: Specify 'extid_version' when looking up by external ID. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2024 22:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 71631 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Simon Tournier Cc: Josselin Poiret , Tobias Geerinckx-Rice , Mathieu Othacehe , 71631-done@debbugs.gnu.org, Ricardo Wurmus , Christopher Baines Mail-Followup-To: 71631@debbugs.gnu.org, ludo@gnu.org, zimon.toutoune@gmail.com Received: via spool by 71631-done@debbugs.gnu.org id=D71631.171943952210450 (code D ref 71631); Wed, 26 Jun 2024 22:06:02 +0000 Received: (at 71631-done) by debbugs.gnu.org; 26 Jun 2024 22:05:22 +0000 Received: from localhost ([127.0.0.1]:40507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMalS-0002iP-Ew for submit@debbugs.gnu.org; Wed, 26 Jun 2024 18:05:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56028) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMalQ-0002i6-Kl for 71631-done@debbugs.gnu.org; Wed, 26 Jun 2024 18:05:17 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMajC-00065l-0W; Wed, 26 Jun 2024 18:02:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=T/ymZUUtJ5qIV8d7fDcvIA15rMcTtCfMt3qo0mNnRRo=; b=JI64yEfUTkdSWnJ+4WhA knrzJyLd2rPjfFE7g4GoEMjKmnbzM5XQToRHB4VbmMtpgat7uATWUp0BCoWZmbubg0ERzoIKYZ4Bp rSTB5iuy0SvGTdraQg3DTN0t2UzVYVaHbzcHrZVtm2oBlIwWHM9d/ofdRpkXAzsF7nWkzSsoGotrO wLC99RzdiwWduN2jnwE6kgzDK4usI+Cg6BXARj4EJGQ5iyNfN0VFscSh8kX6RhMj2KHks9W+CSWUd 8opp1axJivghoSmwmR3nv+92JM3q3Ybbl5rUDQ2FYbeckJIkQesGKH5ncahKMTgFKat4nazrgToFO 1UIl/g0t54VFDA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <84f97438f7a1e7d88af4ffb01140b09dc7675312.1718718438.git.zimon.toutoune@gmail.com> (Simon Tournier's message of "Tue, 18 Jun 2024 16:02:51 +0200") References: <84f97438f7a1e7d88af4ffb01140b09dc7675312.1718718438.git.zimon.toutoune@gmail.com> Date: Thu, 27 Jun 2024 00:02:54 +0200 Message-ID: <87o77n9xbl.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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: 3CC501ED74 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -5.77 X-Spam-Score: -5.77 X-TUID: QWHSnyqHzlhF Hi, Simon Tournier skribis: > Reported in . > > * guix/swh.scm (swh-url): Don't redirect when URL contains 'extid_version= '. > (lookup-external-id): Specify 'extid_version' avoiding SWH's bug from past > version. > > Change-Id: Iea2a5256e0612dae95567907bb11edb92a50df73 > --- > guix/swh.scm | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > Hi, > > Without the patch: > > $ guix repl > scheme@(guix-user)> (use-modules (guix swh) (gnu packages guile-xyz)) > scheme@(guix-user)> (lookup-directory-by-nar-hash > (content-hash-value (origin-hash (package-sourc= e guile-wisp))) 'sha256) > $1 =3D "swh:1:dir:218d95849f10fc0691d7dfa80999ce5061e654ef" > > This is incorrect. As explained in: > > https://gitlab.softwareheritage.org/swh/meta/-/issues/5093 > > The mismatch comes from something unexpected on SWH side. That had been > corrected and the way to access to the fix is to update the version; henc= e the > patch. > > $ ./pre-inst-env guix repl > scheme@(guix-user)> (use-modules (guix swh) (gnu packages guile-xyz)) > scheme@(guix-user)> (lookup-directory-by-nar-hash > (content-hash-value (origin-hash (package-sourc= e guile-wisp))) 'sha256) > $1 =3D "swh:1:dir:1f35a460673e2c8ccf948b8c18cb8c18d2ec24fe" Woow. I pushed it as bd908af0c619cb1b74afeeb07839d7af08de9d91 with a small modification: =E2=80=98swh-url=E2=80=99 checks for parameters (the =E2=80= =9C?param=3Dvalue=E2=80=9D bit) rather than =E2=80=9Cextid_version=E2=80=9D specifically. I also moved the= link to the issue to =E2=80=98lookup-external-id=E2=80=99. Thank you! Ludo=E2=80=99.