From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0OowCuuO82DlDAAAgWs5BA (envelope-from ) for ; Sun, 18 Jul 2021 04:16:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id QBTJBeuO82C8AgAAbx9fmQ (envelope-from ) for ; Sun, 18 Jul 2021 02:16:11 +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 276D01BF6B for ; Sun, 18 Jul 2021 04:16:10 +0200 (CEST) Received: from localhost ([::1]:49676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4wLg-00049A-Je for larch@yhetil.org; Sat, 17 Jul 2021 22:16:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4wLa-00048i-5i for guix-patches@gnu.org; Sat, 17 Jul 2021 22:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43378) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4wLZ-0007dS-UM for guix-patches@gnu.org; Sat, 17 Jul 2021 22:16:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4wLZ-0000T1-Mx for guix-patches@gnu.org; Sat, 17 Jul 2021 22:16:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jul 2021 02:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49589 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49589@debbugs.gnu.org Cc: Sarah Morgensen , 49589-done@debbugs.gnu.org X-Debbugs-Original-To: Sarah Morgensen via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.16265745131726 (code B ref -1); Sun, 18 Jul 2021 02:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Jul 2021 02:15:13 +0000 Received: from localhost ([127.0.0.1]:54921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4wKm-0000Rm-MX for submit@debbugs.gnu.org; Sat, 17 Jul 2021 22:15:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:37168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4wKk-0000Rb-8t for submit@debbugs.gnu.org; Sat, 17 Jul 2021 22:15:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4wKk-00045s-0e for guix-patches@gnu.org; Sat, 17 Jul 2021 22:15:10 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:36458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4wKi-0006zg-G6 for guix-patches@gnu.org; Sat, 17 Jul 2021 22:15:09 -0400 Received: by mail-qk1-x72f.google.com with SMTP id t185so13044724qkd.3 for ; Sat, 17 Jul 2021 19:15:07 -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=v3mQOli/5AP9haN7TxQNC6lHzTlshjhmwxYB1eH6ba4=; b=jV8EGjV1yGByNjdsCiddFI+4VaH6nYcaGD2AjOO2E1SzBsXXQi2fxRkQOpT4onsZUR XPO3yYn3RHY3Ie8vAg2nbw+1x21lOHAKBQ6Lr3OJgnsjzM2fOivks2wv6YzPKQ3AjAnA CB/ZXQqTHSsio6D5sS3L9dW3uDtzwyf4Bd38iJnKuvC6WddMUsEpdqbYA4msQ5eSrwGc ofNH6xSGXt88IIIFXNaU+FJTWvHabhvckEusEnrJP9966AjKeUXo+ZyzqH5rf8Ei9Cmf hmCr+O/d4lRqoFBlcgeNYWW4INtr7yJcVS3mMmEh90l4CDJBU6CF03wZEkbLBvIyQ4U2 6pnQ== 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=v3mQOli/5AP9haN7TxQNC6lHzTlshjhmwxYB1eH6ba4=; b=BBsPPO8lXF6B1s78O3ntUzjV5sDGdUy2vFVTR/ez953DcI6o0pPshfhRt09M4uJVqg egA8az5rrCyaKRXU0b+4XiQ3+3IBGokUf+5pnJdiyCWt0P8/xI7ditLvHNXKt5NaEZwY 7K3bIcFfVMwuq0+SBJVQgbreF6HRQB/mhLkyUZneioAwcwzTjmWkzLRm7pP7Ao5uZCP5 t6GLjN+aUU5GC+oULcITqEDpMoK6tluCg+ogMF9L3HbTglZlo5nOz46kt51KcbzfPMqq eYLKsrOolUKNEc18xXk+nx/bQPUci6TqKzFk7Dr8mlXnjqa9Ns2kzPhKsAMWPwpImXXM DzVw== X-Gm-Message-State: AOAM531VttXKIi+zNCm3x7ZyrLcKFOsFoXuB/mkN5AOPZxX/U1argmAa oXSK7oH0sLYO4YWdbT3MAtE= X-Google-Smtp-Source: ABdhPJzIDbWSOSZbBpQe5bGT98rZU3kb6k5GRBIw/j5GLOdqGN7GfECvPs82tAxv0OmhYQtz7mgmBg== X-Received: by 2002:a05:620a:40ce:: with SMTP id g14mr17742845qko.436.1626574507132; Sat, 17 Jul 2021 19:15:07 -0700 (PDT) Received: from hurd (dsl-148-66.b2b2c.ca. [66.158.148.66]) by smtp.gmail.com with ESMTPSA id d28sm2878114qkj.25.2021.07.17.19.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jul 2021 19:15:06 -0700 (PDT) From: Maxim Cournoyer References: <52c3bd00c1e919b5e7f8a76b89cb637d3fc2a616.1626399442.git.iskarian@mgsn.dev> Date: Sat, 17 Jul 2021 22:15:05 -0400 In-Reply-To: <52c3bd00c1e919b5e7f8a76b89cb637d3fc2a616.1626399442.git.iskarian@mgsn.dev> (Sarah Morgensen via Guix-patches via's message of "Thu, 15 Jul 2021 18:41:49 -0700") Message-ID: <874kcsl652.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::72f; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x72f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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=1626574570; 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: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=v3mQOli/5AP9haN7TxQNC6lHzTlshjhmwxYB1eH6ba4=; b=pJ0M6i1sIENYGiG8v+im95YY7rQIdtuIzvwJPdURgSw78U20O2N1lWeQmJ3dYAR4cadPb9 MIhtn+TqnyQFiyLGp7epe/xD2MO+ZcYa2w0XpWZxTqOntrsx/ZDyqTYpvTy0XVVOg9nau/ kq8uqK8lsO+JCjMZdfriq41ZMcNSBU9TklaamEj9p9nUssl0pBjd4iMmiEjrGTTwGyQE52 BJRL5+XvC+/NZkoBNZtlRkQgvgU7XeVGfb6sJfZv4J4cvKDHxai33VsYFrb4WVYrIAkcIx A7nwhWwhdHbuG+iI5UgtDg+LLQWyYSIiPji5RkpA8snnWz145k9gK9WXUJ/o4Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626574570; a=rsa-sha256; cv=none; b=nnUiPCg9K+xSXwqDYjlXJ8istfNLq/NdnzFhenHUDhNJAesLtjLJ3Mnt8MBRDv9igyl0hF o+6dpoQg0y+aTKYpEs6dv11HNCUY6fXdjygfX2wfinCLdo9ac0lvwhSgvQegkpvDfmau6w vjkbvS2mmRmwAAuMychlhbT0c2iM6wngWl49kDwo3+mgx4XrD2imLELf73tSk5pMYmr967 7kq2hZiL0Iv4X3czvJDneIvhQmaiQEVTpcfIwEJCFrfgPaGub8MyM0UUJzGKY43LrtNLhW FzAsvz33SyUZupRdCpRZU1rRtdxjv5Tc8WS+nNGJS5JSeBbE9DJSz5j9HRYVww== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=jV8EGjV1; 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=jV8EGjV1; 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: 276D01BF6B X-Spam-Score: -1.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: EZWitlyxFycC Hello, Sarah Morgensen via Guix-patches via writes: > * guix/import/go.scm (go-package-licenses): Find license names in > 'h2 // div // *text*' elements rather than 'h2 // *text*' elements. > --- > Hello Guix, > > A change to the page formatting on pkg.go.dev has caused Go imports to have > erroneous license entries: > > (license > (list unknown-license! > unknown-license! > unknown-license! > unknown-license! > license:expat)))) > > > This fixes that. > > guix/import/go.scm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/guix/import/go.scm b/guix/import/go.scm > index d8f838f635..f6a68d62bb 100644 > --- a/guix/import/go.scm > +++ b/guix/import/go.scm > @@ -146,7 +146,7 @@ name (e.g. \"github.com/golang/protobuf/proto\")." > ;; Extract the text contained in a h2 child node of any > ;; element marked with a "License" class attribute. > (select (sxpath `(// (* (@ (equal? (class "License")))) > - h2 // *text*)))) > + h2 // div // *text*)))) > (select (html->sxml body #:strict? #t)))) > > (define (sxml->texi sxml-node) > > base-commit: 01d7e8c2782f61e741f8beff7888adfbdb61779d LGTM! Tested and applied as 59d20bcfcc. Thank you! Closing. Maxim