From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qAX8Hizk8GCjXQEAgWs5BA (envelope-from ) for ; Fri, 16 Jul 2021 03:43:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id SOqyGizk8GCJJQAA1q6Kng (envelope-from ) for ; Fri, 16 Jul 2021 01:43:08 +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 2C97F18B24 for ; Fri, 16 Jul 2021 03:43:08 +0200 (CEST) Received: from localhost ([::1]:46812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4Csd-0004a8-8z for larch@yhetil.org; Thu, 15 Jul 2021 21:43:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4CsY-0004Z2-NB for guix-patches@gnu.org; Thu, 15 Jul 2021 21:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4CsY-0006xE-FI for guix-patches@gnu.org; Thu, 15 Jul 2021 21:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4CsY-0003wp-Dg for guix-patches@gnu.org; Thu, 15 Jul 2021 21:43:02 -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: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 01:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49589 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49589@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162639972515106 (code B ref -1); Fri, 16 Jul 2021 01:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jul 2021 01:42:05 +0000 Received: from localhost ([127.0.0.1]:50130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4Crc-0003va-RZ for submit@debbugs.gnu.org; Thu, 15 Jul 2021 21:42:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:34302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4CrY-0003vA-VO for submit@debbugs.gnu.org; Thu, 15 Jul 2021 21:42:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4CrY-0004QV-6J for guix-patches@gnu.org; Thu, 15 Jul 2021 21:42:00 -0400 Received: from out0.migadu.com ([2001:41d0:2:267::]:39198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4CrV-0006Am-H5 for guix-patches@gnu.org; Thu, 15 Jul 2021 21:41:59 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626399711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tOLP0yhB2Wb9KmVVMrJRSeyOWHVPVn8/vFgb6I1x98c=; b=KvBgkZzccf0QuuEmXyZPJ787hGhCDoPHzrVp8ilO8XGCdAFaBeYn63bwtJPybVH+3r/9Nx UfKH0yX7tPPMgZZ7AkGQnZ2LqKOzZDgPWlVXrwHIvxRAw/doGSgJWmKjVj5bwuJGuowCE3 zn95m7sZ38pEaOOPDPp77aEdswdYGW8= Date: Thu, 15 Jul 2021 18:41:49 -0700 Message-Id: <52c3bd00c1e919b5e7f8a76b89cb637d3fc2a616.1626399442.git.iskarian@mgsn.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=iskarian@mgsn.dev; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, 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" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches From: Sarah Morgensen via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626399788; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=tOLP0yhB2Wb9KmVVMrJRSeyOWHVPVn8/vFgb6I1x98c=; b=YbjfMRHIuwvQDBFGfxXHTzc+yCY3pvXb3as1/L8bf0ywx9wjV15n0dDtGfgKNjSvYI2cNZ TRyuAuEWZADPzqfLD9jnhPHPOUX9UZ1So0Y9eFnjj/LY0KJ+fCItZw3eN1CT/G02urCkVY ncCOxNKsJhOok7lDwDhPcQpwGyORGx9CTYe3R9Qt3Z0Jfzpprd3jFR2d/nQLfYWIXXdlSG BqdTAIAPVJDTARNWkj5zPbTskVwQLpdZ/GPHbVq2YwotMtyh6Pcx1kiuhwX6PP5s6G8YrS D4ZDyxqNMNC5I8khfiZ1ndwbh7/M46Qk8Kf8jIuk9kDWXgnKWvxk9555fYiQKA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626399788; a=rsa-sha256; cv=none; b=PZGyAdLKq4kwtGLReZ21CJm2vuveJgqr/tS3mzU1PquaebhD+jjugeWd3EQVSm+Ob8hwad 0zfKsEDJRV7pMr+mlO1G/C6LF4so0J4VcELb3DYpPX9wYL4Ag81L3n624JH28GfYIyxk9c ZqlHtB18qk9B3Jr3Efnsodvb6zICGA3Qp3H5VnL5EBFe68nmlgNCrn2xLJAqY0264zdRmh wTkOJk7HNSYjD+KBL8iMxX3ryfrk02GhOlms+dROF+pWebuSdpwbYUyhmOCgC4KwegtPUG PqIBDqL+P3mkaPvGxoFvrRIsKrDlN6HIKIscFGkwEbQScTfmLssR1A3g0AfofA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=KvBgkZzc; dmarc=pass (policy=none) header.from=gnu.org; 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.10 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=KvBgkZzc; dmarc=pass (policy=none) header.from=gnu.org; 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: 2C97F18B24 X-Spam-Score: 1.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: T7aFiR/ZM8Ib * 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: --8<---------------cut here---------------start------------->8--- (license (list unknown-license! unknown-license! unknown-license! unknown-license! license:expat)))) --8<---------------cut here---------------end--------------->8--- 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 -- 2.31.1