all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update.
@ 2021-07-16  1:41 Sarah Morgensen via Guix-patches via
  2021-07-18  2:15 ` Maxim Cournoyer
  0 siblings, 1 reply; 2+ messages in thread
From: Sarah Morgensen via Guix-patches via @ 2021-07-16  1:41 UTC (permalink / raw)
  To: 49589

* 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





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update.
  2021-07-16  1:41 [bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update Sarah Morgensen via Guix-patches via
@ 2021-07-18  2:15 ` Maxim Cournoyer
  0 siblings, 0 replies; 2+ messages in thread
From: Maxim Cournoyer @ 2021-07-18  2:15 UTC (permalink / raw)
  To: 49589; +Cc: Sarah Morgensen, 49589-done

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




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-07-18  2:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-16  1:41 [bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update Sarah Morgensen via Guix-patches via
2021-07-18  2:15 ` Maxim Cournoyer

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.