guix-commits
[Top][All Lists]
Advanced

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

04/18: gnu-maintenance: Produce mirror:// URIs in latest-ftp-release.


From: guix-commits
Subject: 04/18: gnu-maintenance: Produce mirror:// URIs in latest-ftp-release.
Date: Mon, 26 Sep 2022 17:32:09 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit d877dc098bcf1f1b2f39ba5a6e3701eda547d004
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Thu Sep 1 11:01:49 2022 +0200

    gnu-maintenance: Produce mirror:// URIs in latest-ftp-release.
    
    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.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 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 20e3bc1cba..b6450994e6 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -363,10 +363,12 @@ return the corresponding signature URL, or #f it 
signatures are unavailable."
       (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))



reply via email to

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