From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id dehkKrmg82AQKAAAgWs5BA (envelope-from ) for ; Sun, 18 Jul 2021 05:32:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 2CSNJbmg82AVPAAAB5/wlQ (envelope-from ) for ; Sun, 18 Jul 2021 03:32:09 +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 417751C7C2 for ; Sun, 18 Jul 2021 05:32:09 +0200 (CEST) Received: from localhost ([::1]:54914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4xXE-0004os-7l for larch@yhetil.org; Sat, 17 Jul 2021 23:32:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4xX8-0004oN-PP for guix-patches@gnu.org; Sat, 17 Jul 2021 23:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43428) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4xX8-0008It-8r for guix-patches@gnu.org; Sat, 17 Jul 2021 23:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4xX8-0002CI-5F for guix-patches@gnu.org; Sat, 17 Jul 2021 23:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49591] [PATCH] import: go: Handle multiple go-import meta tags. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jul 2021 03:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49591@debbugs.gnu.org Cc: Sarah Morgensen , 49591-done@debbugs.gnu.org X-Debbugs-Original-To: Sarah Morgensen via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.16265790978403 (code B ref -1); Sun, 18 Jul 2021 03:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Jul 2021 03:31:37 +0000 Received: from localhost ([127.0.0.1]:54971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4xWj-0002BT-In for submit@debbugs.gnu.org; Sat, 17 Jul 2021 23:31:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:42416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4xWh-0002BL-8h for submit@debbugs.gnu.org; Sat, 17 Jul 2021 23:31:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4xWh-0004mk-0Q for guix-patches@gnu.org; Sat, 17 Jul 2021 23:31:35 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:45655) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4xWf-0007qX-CM for guix-patches@gnu.org; Sat, 17 Jul 2021 23:31:34 -0400 Received: by mail-qt1-x832.google.com with SMTP id z25so10372180qto.12 for ; Sat, 17 Jul 2021 20:31:32 -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:content-transfer-encoding; bh=ywwCgwHV1bT28mdC7xL0tRAFNtUapu5pm031QYsRje8=; b=CBWFuscnHWx/WukIzGy7rpCP0F7mNHr7mjhnOdlVxXL3P2tYcs5kQnjAOKig103dym obsyBo+b2ZSITfYnje+K6XgjQdPgRgYhjr9o/WyFnmU+f2WJ0UickmAA4DeXZfF11cvu oG08uEwUAg9F4R8vYVRcmgDR1F6ofMuBqnoOMoCVUmCax9bpuOj+o3FaLJ/lY4R6uxXw F8rd2tmJZhGCkVycW1iKsbHCtRA6XbKEXqLwpdYhDl4EiT2jAcd3AdZUTVHHRP0ovNB+ VnU5Nlu7U/nFc3Xf3kisCyYn9tCc34dFsKtBSwXo5BCQgG1ou1zQlKr+8P0B2NEu0RdB TrXQ== 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:content-transfer-encoding; bh=ywwCgwHV1bT28mdC7xL0tRAFNtUapu5pm031QYsRje8=; b=VxmYdPFdi5sLItLrHFAICdEBnCy8oI7OJDizEb8Q+8xvsKLcDU/uQB4Qa+H75fbxTY lfCNeQtvkoo++cHJx4LzY7G5VSUhmEys0kEHTeR7N9MxpHmqZ0ML5sQ3k5EBlc4kFGG2 P78SJorrfi9XermJSRgF3Az66GVKF83vNqa7ntGBp4pzyklSJxmxAFa7dWPHNpnOP/Jn ZTX4lq/MjCeWeRWAOyxDzEHB6wCE5vP26pA5m5FJWUzoGyD5skU7hjwQJMMVDeRJm49X CQUfQ5KSzRBGQrFJgqxghX9uIDG5UE602bxmpktv+/PjxpHDxze/nDVp85Cvjkh/4jgL Au6A== X-Gm-Message-State: AOAM530WXygtTUMXiyWyLlbHuaNgqYCcULmTXZlOIFz6eoEYNEzVJo3A ZmpT15GuUCu2IQzl9QKhsD4= X-Google-Smtp-Source: ABdhPJyE5jdpN4QaXdP4HozUk594hvoMz9bU2M5/Ofcqu0W5NxW4VFFQGSwcaoX8ZlZWhet8uTeIMg== X-Received: by 2002:ac8:6994:: with SMTP id o20mr16728281qtq.21.1626579092233; Sat, 17 Jul 2021 20:31:32 -0700 (PDT) Received: from hurd (dsl-148-66.b2b2c.ca. [66.158.148.66]) by smtp.gmail.com with ESMTPSA id s81sm6002975qka.82.2021.07.17.20.31.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jul 2021 20:31:31 -0700 (PDT) From: Maxim Cournoyer References: Date: Sat, 17 Jul 2021 23:31:31 -0400 In-Reply-To: (Sarah Morgensen via Guix-patches via's message of "Thu, 15 Jul 2021 19:01:52 -0700") Message-ID: <87zgukjo18.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::832; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x832.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626579129; 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=ywwCgwHV1bT28mdC7xL0tRAFNtUapu5pm031QYsRje8=; b=e3A//iY+c5Xxa4AMf8SlW1pS84lIHc0LEn2FPQ1GXgRPi0qGeeJU4UroE3IcEEzsB0idAr oAq2y7ozXXkEpbiLlFjQFgoLLh8hkIx5A+7MY9cYICq2BxP2ij5TNeuGFdnbTcaoh1AOB9 Q8URlhMIxOu5mYO4Tc/Yl0t1hmeafBPgsUT4Lz/RySr5MryYStRxqTTxG7d8h+51XoRuqU kmB1n3LeU8V1CjJTTsYIx53VO/a/vwDR8EEDB9oAlXrqMWL5qpXgvUh4w8Sxyl3vshqixy p9Nb/GHPtNYXL4Xk/z8SkBZz5ziCWnMom18pQYPTR/b8TQ8rvFGEAO3Di0qjDg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626579129; a=rsa-sha256; cv=none; b=eFHUugbpYXS/rgJZlaTiDknHEUWranWji9dIU6w1wb3HTWK2w2Pn1/F6bPzwhT/KP3qHHu u5gbuIK4HUq2frW52BYR0EcTSW9tb6FBq7Q4O51QnGxpIt1MOTmBlqMXFwXcDZsC9AUBut Shd6krE24oeXR7w9BzxYnbSHQEBh3o17Z22OeN+BeFbqvqNR3BBE0RX0LQRpLBEYoJgtIB 8OYwxNsjhxGNLHr2VVJ6Fc/jjC+cEM0Ni2NozWLjJT7tOI7a5fQarM8gLCvf2K3Y9N0ofE 10+EUqlbbLz/fGJgF+BRRm+sueGLMXg6Mt1yr/DlQ4A4Bn444HPFrvp45XOsww== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=CBWFuscn; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=CBWFuscn; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 417751C7C2 X-Spam-Score: -1.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: BcBAgJusiWZ8 Hello again, Sarah Morgensen via Guix-patches via writes: > * guix/import/go.scm (fetch-module-meta-data): Parse all go-import meta > tags and return the first 'module-meta' with a matching import prefix. > [go-import->module-meta]: Extract parsing into new procedure. > --- > Hello Guix, > > It seems sometimes a module's go-get page contains multiple > > > > tags, for example the 'bazil.org/fuse' module. This causes a backtrace wh= en > attempting to import such a module: > > $ guix import go bazil.org/fuse > following redirection to `https://bazil.org/fuse/?go-get=3D1'... > Backtrace: > 5 (primitive-load "/home/sarah/.config/guix/current/bin/g=E2= =80=A6") > In guix/ui.scm: > 2182:7 4 (run-guix . _) > 2145:10 3 (run-guix-command _ . _) > In guix/scripts/import.scm: > 120:11 2 (guix-import . _) > In guix/scripts/import/go.scm: > 118:27 1 (guix-import-go . _) > In guix/import/go.scm: > 467:4 0 (go-module->guix-package _ #:goproxy _ #:version _ # _) > > guix/import/go.scm:467:4: In procedure go-module->guix-package: > Throw to key `match-error' with args `("match" "no matching pattern" ((co= ntent "bazil.org/bazil git https://github.com/bazil/bazil") (content "bazil= .org/fuse git https://github.com/bazil/fuse") (content "bazil.org/bolt-moun= t git https://github.com/bazil/bolt-mount") (content "bazil.org/zipfs git h= ttps://github.com/bazil/zipfs") (content "bazil.org/plop git https://github= .com/bazil/plop")))'. > > > This patch makes the importer parse all such tags and search for one with= an > import prefix that is a prefix of the module-path we are looking for. Good catch, LGTM! > (I attempted to add a unit test but could not figure out how to make the > record type accessible to the test script.) I started adding a new fixture for fixtures-go-bazil-org-fuse-test, but but I'm rusty as to where all these bits are pulled from. Perhaps it could be nice to add it, but otherwise it seems better in the mean time to fix apply this fix as-is. Committed with 5eba9c0960. Thank you! Closing. Maxim