[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after
From: |
Maxim Cournoyer |
Subject: |
[bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update. |
Date: |
Sat, 17 Jul 2021 22:15:05 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) |
Hello,
Sarah Morgensen via Guix-patches via <guix-patches@gnu.org> 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