[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#49591] [PATCH] import: go: Handle multiple go-import meta tags.

From: Sarah Morgensen
Subject: [bug#49591] [PATCH] import: go: Handle multiple go-import meta tags.
Date: Thu, 15 Jul 2021 19:01:52 -0700

* 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

  <meta name="go-import" ...>

tags, for example the '' module. This causes a backtrace when
attempting to import such a module:

-----8<---------------cut here---------------start------------->8---
$ guix import go
following redirection to `'...
           5 (primitive-load "/home/sarah/.config/guix/current/bin/g…")
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" ((content 
" git";) (content " 
git";) (content " git";) (content " git";) (content " git";)))'.
--8<---------------cut here---------------end--------------->8---

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.

(I attempted to add a unit test but could not figure out how to make the
record type accessible to the test script.)


 guix/import/go.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/guix/import/go.scm b/guix/import/go.scm
index d8f838f635..182db0ecfb 100644
--- a/guix/import/go.scm
+++ b/guix/import/go.scm
@@ -460,17 +460,21 @@ Optionally include a VERSION string to append to the 
   "Retrieve the module meta-data from its landing page.  This is necessary
 because goproxy servers don't currently provide all the information needed to
 build a package."
+  (define (go-import->module-meta content-text)
+    (match (string-split content-text #\space)
+      ((root-path vcs repo-url)
+       (make-module-meta root-path (string->symbol vcs)
+                         (strip-.git-suffix/maybe repo-url)))))
   ;; <meta name="go-import" content="import-prefix vcs repo-root">
   (let* ((meta-data (http-fetch* (format #f "https://~a?go-get=1"; 
          (select (sxpath `(// head (meta (@ (equal? (name "go-import"))))
                               // content))))
     (match (select (html->sxml meta-data #:strict? #t))
       (() #f)                           ;nothing selected
-      (((content content-text))
-       (match (string-split content-text #\space)
-         ((root-path vcs repo-url)
-          (make-module-meta root-path (string->symbol vcs)
-                            (strip-.git-suffix/maybe repo-url))))))))
+      ((('content content-text) ..1)
+       (find (lambda (meta)
+               (string-prefix? (module-meta-import-prefix meta) module-path))
+             (map go-import->module-meta content-text))))))
 (define (module-meta-data-repo-url meta-data goproxy)
   "Return the URL where the fetcher which will be used can download the

base-commit: 01d7e8c2782f61e741f8beff7888adfbdb61779d

reply via email to

[Prev in Thread] Current Thread [Next in Thread]