From: Sarah Morgensen <iskarian@mgsn.dev>
To: 50289@debbugs.gnu.org
Cc: Attila Lendvai <attila@lendvai.name>
Subject: [bug#50289] [PATCH] import: go: Fix import when import path redirects.
Date: Mon, 30 Aug 2021 19:05:19 -0700 [thread overview]
Message-ID: <c9ee1efc228bc7ba2287d464734e995502ef46a8.1630374913.git.iskarian@mgsn.dev> (raw)
* guix/import/go.scm (fetch-module-meta-data): If no meta entries
have a matching import prefix, return the first entry instead of #f.
---
X-Debbugs-CC: Attila Lendvai <attila@lendvai.name>
Hello Guix,
As reported by Attila on IRC, the Go importer currently chokes when the
import path URL redirects, for example with "github.com/prometheus/tsdb".
This is due to my modification to 'fetch-module-meta-data' to handle multiple
package's meta tags on one page [0]. It selects the meta based on whether its
import prefix matches the URL we requested. This breaks when the URL
redirects but the import path is not changed (I did not realize that this
was valid... go figure). This patch fixes that by falling back to the first
meta if none match.
[0] https://issues.guix.gnu.org/49591
--
Sarah
guix/import/go.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/guix/import/go.scm b/guix/import/go.scm
index 617a0d0e23..57a135b9a9 100644
--- a/guix/import/go.scm
+++ b/guix/import/go.scm
@@ -483,9 +483,12 @@ (define (fetch-module-meta-data module-path)
(match (select (html->sxml meta-data #:strict? #t))
(() #f) ;nothing selected
((('content content-text) ..1)
- (find (lambda (meta)
- (string-prefix? (module-meta-import-prefix meta) module-path))
- (map go-import->module-meta content-text))))))
+ (or
+ (find (lambda (meta)
+ (string-prefix? (module-meta-import-prefix meta) module-path))
+ (map go-import->module-meta content-text))
+ ;; Fallback to the first meta if no import prefixes match.
+ (go-import->module-meta (first 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: 994d8ce394e88b55985241b7b14f6a8459bcf9e8
--
2.31.1
next reply other threads:[~2021-08-31 2:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 2:05 Sarah Morgensen [this message]
2021-09-07 13:55 ` bug#50289: [PATCH] import: go: Fix import when import path redirects Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c9ee1efc228bc7ba2287d464734e995502ef46a8.1630374913.git.iskarian@mgsn.dev \
--to=iskarian@mgsn.dev \
--cc=50289@debbugs.gnu.org \
--cc=attila@lendvai.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).