~ruther/guix-local

b6124f00b86cd2138ed8d50c5ac04aa4d1e7bc82 — Ludovic Courtès 10 years ago 56b6bef
gnu-maintenance: Fix URLs returned by 'latest-release' for deep trees.

With this, (latest-release "gcc") returns an <upstream-source> with URL:

  ftp://ftp.gnu.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.tar.gz

Previous it would omit "gcc-5.3.0/" from the URL.

Fixes a regression introduced in 0a7c5a0.

* guix/gnu-maintenance.scm (latest-release)[file->url, file->source]:
Add 'directory' parameter.  Update users.
1 files changed, 4 insertions(+), 4 deletions(-)

M guix/gnu-maintenance.scm
M guix/gnu-maintenance.scm => guix/gnu-maintenance.scm +4 -4
@@ 329,11 329,11 @@ open (resp. close) FTP connections; this can be useful to reuse connections."
  (let-values (((server directory) (ftp-server/directory project)))
    (define conn (ftp-open server))

    (define (file->url file)
    (define (file->url directory file)
      (string-append "ftp://" server directory "/" file))

    (define (file->source file)
      (let ((url (file->url file)))
    (define (file->source directory file)
      (let ((url (file->url directory file)))
        (upstream-source
         (package project)
         (version (tarball->version file))


@@ 362,7 362,7 @@ open (resp. close) FTP connections; this can be useful to reuse connections."
             (releases (filter-map (match-lambda
                                     ((file 'file . _)
                                      (and (release-file? project file)
                                           (file->source file)))
                                           (file->source directory file)))
                                     (_ #f))
                                   entries)))