unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxime Devos <maximedevos@telenet.be>
To: 57515@debbugs.gnu.org
Subject: [bug#57515] [PATCH 2/8] gnu-maintenance: Produce mirror:// URIs in latest-ftp-release.
Date: Thu,  1 Sep 2022 11:01:49 +0200	[thread overview]
Message-ID: <309bbf185a707fee8f98f741aa5a67fdce6cfda0.1662022775.git.maximedevos@telenet.be> (raw)
In-Reply-To: <cover.1662022469.git.maximedevos@telenet.be>

Partially fixes: https://issues.guix.gnu.org/57477.
As a test, try updating gnupg. Before the patch, a ftp:// URL was produced,
now the mirror:// is preserved.

* guix/gnu-maintenance.scm (latest-ftp-release)[file->source]{urls,signature-urls}:
Call uri-mirror-rewrite on the URLs.
---
 guix/gnu-maintenance.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 51e8fcd815..84fd087319 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -363,10 +363,12 @@ (define (file->source directory file)
       (upstream-source
        (package project)
        (version (tarball->version file))
-       (urls (list url))
+       ;; uri-mirror-rewrite: Don't turn nice mirror:// URIs into ftp://
+       ;; URLs during "guix refresh -u".
+       (urls (list (uri-mirror-rewrite url)))
        (signature-urls (match (file->signature url)
                          (#f #f)
-                         (sig (list sig)))))))
+                         (sig (list (uri-mirror-rewrite sig))))))))
 
   (let loop ((directory directory)
              (result    #f))
-- 
2.37.2





  parent reply	other threads:[~2022-09-01  9:36 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1662022469.git.maximedevos@telenet.be>
2022-09-01  9:01 ` [bug#57515] [PATCH 1/8] guix: Extract logic of the check-mirror-url Maxime Devos
2022-09-01  9:01 ` Maxime Devos [this message]
2022-09-01  9:01 ` [bug#57515] [PATCH 3/8] gnu-maintenance: Produce mirror:// URIs in latest-html-release Maxime Devos
2022-09-01  9:01 ` [bug#57515] [PATCH 4/8] download: Switch savannah mirrors to HTTPS URLs Maxime Devos
2022-09-01  9:01 ` [bug#57515] [PATCH 5/8] gnu-maintenance: Simplify latest-savannah-release Maxime Devos
2022-09-01  9:01 ` [bug#57515] [PATCH 6/8] download: Add a kernel.org mirror Maxime Devos
2022-09-01  9:01 ` [bug#57515] [PATCH 7/8] gnu-maintenance: Simplify latest-kernel.org-release Maxime Devos
2022-09-01  9:01 ` [bug#57515] [PATCH 8/8] gnu-maintenance: Remove unused procedures Maxime Devos

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=309bbf185a707fee8f98f741aa5a67fdce6cfda0.1662022775.git.maximedevos@telenet.be \
    --to=maximedevos@telenet.be \
    --cc=57515@debbugs.gnu.org \
    /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).